From 6ad364ab140acd75e3b097952d635b30878c5fe3 Mon Sep 17 00:00:00 2001
From: Thierry Corbin <thierry.corbin@kauden.fr>
Date: Tue, 19 Dec 2017 09:55:04 +0100
Subject: [PATCH 0001/1124] Accelerate map_uidgid

Hi,

I use the function "map_uidgid" and each restart of the container is at least 30 seconds for the command chown.
With this change I am 1 second.

I added the path ${GITLAB_HOME} at the end to not get an error if the "find" finds nothing.

does this change suit you?
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 44917d19a..791b4930b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1144,7 +1144,7 @@ map_uidgid() {
     echo "Mapping UID and GID for ${GITLAB_USER}:${GITLAB_USER} to $USERMAP_UID:$USERMAP_GID"
     groupmod -o -g ${USERMAP_GID} ${GITLAB_USER}
     sed -i -e "s|:${USERMAP_ORIG_UID}:${USERMAP_GID}:|:${USERMAP_UID}:${USERMAP_GID}:|" /etc/passwd
-    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* -prune -o -print0 | xargs -0 chown -h ${GITLAB_USER}:
+    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* \( ! -uid ${USERMAP_ORIG_UID} -o ! -gid ${USERMAP_ORIG_GID} \) -print0 | xargs -0 chown -h ${GITLAB_USER}: ${GITLAB_HOME}
   fi
 }
 

From d474f8084d88e41c0508e7a48d23a6c5e871fa24 Mon Sep 17 00:00:00 2001
From: eiabea <developer@eiabea.com>
Date: Wed, 17 Jan 2018 09:57:14 +0100
Subject: [PATCH 0002/1124] Fixed readme to match new backup file naming

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fb26265a1..f5bc104a1 100644
--- a/README.md
+++ b/README.md
@@ -1097,18 +1097,18 @@ docker run --name gitlab -it --rm [OPTIONS] \
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
 
-To avoid user interaction in the restore operation, specify the timestamp of the backup using the `BACKUP` argument to the rake task.
+To avoid user interaction in the restore operation, specify the timestamp, date and version of the backup using the `BACKUP` argument to the rake task.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:10.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:10.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.3
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1417624827 # Choose to restore from 1417624827
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.3 # Choose to restore from 1515629493
 ```
 
 ## Host Key Backups (ssh)

From ca65e1926a8bfac5585ae9341afbd99b61c121e7 Mon Sep 17 00:00:00 2001
From: eiabea <developer@eiabea.com>
Date: Wed, 17 Jan 2018 16:41:50 +0100
Subject: [PATCH 0003/1124] Retrigger travis build


From c445b673c730faf43f8dbcb2a895df175b3e7d62 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Jul 2018 14:28:50 +0200
Subject: [PATCH 0004/1124] Upgrade GitLab CE to 11.1.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c4138f694..93e60a09e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.1.1**
+- gitlab: upgrade CE to v11.1.1
+
 **11.1.0**
 - gitlab: upgrade CE to v11.1.0
 
diff --git a/Dockerfile b/Dockerfile
index c21b926f1..a698bc3c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM sameersbn/ubuntu:16.04.20180706
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.1.0 \
+ENV GITLAB_VERSION=11.1.1 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=7.1.4 \
diff --git a/README.md b/README.md
index 30c5e0ec3..80affa3b7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.1.0
+# sameersbn/gitlab:11.1.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.1.0
+docker pull sameersbn/gitlab:11.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.1.0
+ sameersbn/gitlab:11.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.1.0
+    sameersbn/gitlab:11.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:sanitize
+    sameersbn/gitlab:11.1.1 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake db:setup
+    sameersbn/gitlab:11.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.0
+docker pull sameersbn/gitlab:11.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 68d8f15e2..668182d21 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.0
+11.1.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 2582c7129..5f707ab95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.1.0
+    image: sameersbn/gitlab:11.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b3b75fd27..a9439a9a7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.0
+docker pull sameersbn/gitlab:11.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.1.0
+sameersbn/gitlab:11.1.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8737f7574..8fb87313b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.1.0
+        image: sameersbn/gitlab:11.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From c3d043b4d53960e4dcff7111df43aefeb490104b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Jul 2018 14:30:30 +0200
Subject: [PATCH 0005/1124] Update gitaly to 0.111.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a698bc3c5..a0643ea96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV GITLAB_VERSION=11.1.1 \
     GITLAB_SHELL_VERSION=7.1.4 \
     GITLAB_WORKHORSE_VERSION=5.0.0 \
     GITLAB_PAGES_VERSION=1.0.0 \
-    GITALY_SERVER_VERSION=0.111.1 \
+    GITALY_SERVER_VERSION=0.111.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 46e45c92da958ed5562b1bd9ee101ecbe90a0b79 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 27 Jul 2018 11:07:56 +0530
Subject: [PATCH 0006/1124] baseimage: switch to official
 ubuntu:xenial-20180705 image

---
 Dockerfile              | 15 +++++++++------
 assets/build/install.sh |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c21b926f1..dfcba2bb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM sameersbn/ubuntu:16.04.20180706
+FROM ubuntu:xenial-20180705
+
 LABEL maintainer="sameer@damagehead.com"
 
 ENV GITLAB_VERSION=11.1.0 \
@@ -24,7 +25,10 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
     GITLAB_BUILD_DIR="${GITLAB_CACHE_DIR}/build" \
     GITLAB_RUNTIME_DIR="${GITLAB_CACHE_DIR}/runtime"
 
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+      wget ca-certificates apt-transport-https \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
  && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \
  && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu xenial main" >> /etc/apt/sources.list \
@@ -37,14 +41,13 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales curl \
+ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+      sudo supervisor logrotate locales curl \
       nginx openssh-server mysql-client postgresql-client redis-tools \
       git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \
       libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm3 libreadline6 libncurses5 libffi6 \
-      libxml2 libxslt1.1 libcurl3 libicu55 \
-      libre2-dev \
-      tzdata \
+      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 6b4b9c2d9..1b9447000 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -27,7 +27,7 @@ exec_as_git() {
 
 # install build dependencies for gem installation
 apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get install -y ${BUILD_DEPENDENCIES}
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUILD_DEPENDENCIES}
 
 # PaX-mark ruby
 # Applying the mark late here does make the build usable on PaX kernels, but

From 96c3e9e9836de5ece3efaf1a2d24cb66756a75ff Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 27 Jul 2018 16:47:09 +0530
Subject: [PATCH 0007/1124] clean up the $HOME/.cache directory after
 installation

Yarn stores every package in a global cache in your user directory on
the file system. This ends up to be around ~400M of extra utilized by
the image and has no benefits whatsoever.

Additionally `go` populates a build cache with will also be cleared
when the ~/.cache directory is purged

/cc @solidnerd
---
 assets/build/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 6b4b9c2d9..2c91560d9 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -386,3 +386,6 @@ EOF
 # purge build dependencies and cleanup apt
 DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
 rm -rf /var/lib/apt/lists/*
+
+# clean up caches
+exec_as_git rm -rf ${GITLAB_HOME}/.cache

From a489a7612e1a8cba3acd02da77523a724f794994 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 28 Jul 2018 10:04:00 +0200
Subject: [PATCH 0008/1124] release 11.1.1


From b20f80e214485f0de6f31ef882efb505ae1a307d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 28 Jul 2018 10:05:41 +0200
Subject: [PATCH 0009/1124] Upgrade GitLab CE to 11.1.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 93e60a09e..f5563714a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.1.2**
+- gitlab: upgrade CE to v11.1.2
+
 **11.1.1**
 - gitlab: upgrade CE to v11.1.1
 
diff --git a/Dockerfile b/Dockerfile
index b771f9900..1f0d2a3fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.1.1 \
+ENV GITLAB_VERSION=11.1.2 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=7.1.4 \
diff --git a/README.md b/README.md
index 80affa3b7..607dff5ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.1.1
+# sameersbn/gitlab:11.1.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.1.1
+docker pull sameersbn/gitlab:11.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.1.1
+ sameersbn/gitlab:11.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.1.1
+    sameersbn/gitlab:11.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:sanitize
+    sameersbn/gitlab:11.1.2 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake db:setup
+    sameersbn/gitlab:11.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.1
+docker pull sameersbn/gitlab:11.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 668182d21..e9ac13b02 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.1
+11.1.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 5f707ab95..6a285949c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.1.1
+    image: sameersbn/gitlab:11.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a9439a9a7..58b1842e8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.1
+docker pull sameersbn/gitlab:11.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.1.1
+sameersbn/gitlab:11.1.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8fb87313b..276449b96 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.1.1
+        image: sameersbn/gitlab:11.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From d9491ff2f2b71d391b75fb43c154aa8f83040f6a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 28 Jul 2018 10:36:53 +0200
Subject: [PATCH 0010/1124] release 11.1.2


From d4d348ef80c5df843c71e90d7befa5c60f8e8e22 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 28 Jul 2018 10:38:39 +0200
Subject: [PATCH 0011/1124] Upgrade GitLab CE to 11.1.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f5563714a..747d88405 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.1.3**
+- gitlab: upgrade CE to v11.1.3
+
 **11.1.2**
 - gitlab: upgrade CE to v11.1.2
 
diff --git a/Dockerfile b/Dockerfile
index 1f0d2a3fe..1686d65e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.1.2 \
+ENV GITLAB_VERSION=11.1.3 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=7.1.4 \
diff --git a/README.md b/README.md
index 607dff5ec..fdaed3c8d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.1.2
+# sameersbn/gitlab:11.1.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.1.2
+docker pull sameersbn/gitlab:11.1.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.1.2
+ sameersbn/gitlab:11.1.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.1.2
+    sameersbn/gitlab:11.1.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:sanitize
+    sameersbn/gitlab:11.1.3 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake db:setup
+    sameersbn/gitlab:11.1.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.1.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.2
+docker pull sameersbn/gitlab:11.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e9ac13b02..427d8b7fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.2
+11.1.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a285949c..d8511c8f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.1.2
+    image: sameersbn/gitlab:11.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 58b1842e8..ab8058d31 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.2
+docker pull sameersbn/gitlab:11.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.1.2
+sameersbn/gitlab:11.1.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 276449b96..206c1b6ee 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.1.2
+        image: sameersbn/gitlab:11.1.3
         env:
         - name: TZ
           value: Asia/Kolkata

From e9caf8e3a1a76cb44b583686d78c56fc8c874f26 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 27 Jul 2018 17:37:14 +0530
Subject: [PATCH 0012/1124] redis: upgrade to sameersbn/redis:4.0.9-1 in
 samples

closes #1666
---
 README.md                               | 6 +++---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docker-compose.yml                      | 2 +-
 docs/docker-compose-registry.yml        | 2 +-
 docs/s3_compatible_storage.md           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 607dff5ec..576ff842c 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:3.0.6
+    sameersbn/redis:4.0.9-1
 ```
 
 Step 3. Launch the gitlab container
@@ -443,7 +443,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis](
 First, lets pull the redis image from the docker index.
 
 ```bash
-docker pull sameersbn/redis:3.0.6
+docker pull sameersbn/redis:4.0.9-1
 ```
 
 Lets start the redis container
@@ -451,7 +451,7 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:3.0.6
+    sameersbn/redis:4.0.9-1
 ```
 
 We are now ready to start the GitLab application.
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 30d52f903..0d20c4cbc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:latest
+    image: sameersbn/redis:4.0.9-1
     command:
     - --loglevel warning
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a285949c..53dd1b106 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:3.0.6
+    image: sameersbn/redis:4.0.9-1
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 676dc10e3..1a8ba4b66 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:3.0.6
+    image: sameersbn/redis:4.0.9-1
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 665b28a77..adb4126f9 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -72,7 +72,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:3.0.6
+    image: sameersbn/redis:4.0.9-1
     command:
     - --loglevel warning
     volumes:

From 2cf172e2a6d9c6ef38d2c7119463efb676440419 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <github@mietz.io>
Date: Sun, 29 Jul 2018 07:50:44 +0200
Subject: [PATCH 0013/1124] Update Changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 747d88405..a0bfe7593 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.1.3**
 - gitlab: upgrade CE to v11.1.3
+- Upgrade redis to 4.X 
 
 **11.1.2**
 - gitlab: upgrade CE to v11.1.2

From 1e5bc66fec1c431624d318fd2e62f6a9d8188b07 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <github@mietz.io>
Date: Sun, 29 Jul 2018 07:51:09 +0200
Subject: [PATCH 0014/1124] Update Changelog.md

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a0bfe7593..b110c0939 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,7 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.1.3**
 - gitlab: upgrade CE to v11.1.3
-- Upgrade redis to 4.X 
+- Upgrade redis to 4.0.9-1
 
 **11.1.2**
 - gitlab: upgrade CE to v11.1.2

From 79eaa5879e5c380e9bc348d24bf4c7c00d41c70d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Jul 2018 07:52:36 +0200
Subject: [PATCH 0015/1124] release 11.1.3


From fb2c9fe336cbf7ff2c8a7612e68106246820c928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20-nexus-=20Mlyn=C3=A1=C5=99?= <nexus@smoula.net>
Date: Sun, 29 Jul 2018 19:28:51 +0200
Subject: [PATCH 0016/1124] Added unzip to system. It's needed for pages:deploy
 task

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

diff --git a/Dockerfile b/Dockerfile
index 1686d65e4..ed8f74e93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update \
       git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \
       libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm3 libreadline6 libncurses5 libffi6 \
-      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata \
+      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \

From 7759ff01b4666e8f09514e1137ae08b9e472db10 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 31 Jul 2018 18:25:38 +0200
Subject: [PATCH 0017/1124] Upgrade GitLab CE to 11.1.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b110c0939..d47007e6e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.1.4**
+- gitlab: upgrade CE to v11.1.4
+
 **11.1.3**
 - gitlab: upgrade CE to v11.1.3
 - Upgrade redis to 4.0.9-1
diff --git a/Dockerfile b/Dockerfile
index 1686d65e4..4fc4f3dbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.1.3 \
+ENV GITLAB_VERSION=11.1.4 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=7.1.4 \
diff --git a/README.md b/README.md
index 000fb0134..a6ec43b43 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.1.3
+# sameersbn/gitlab:11.1.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.1.3
+docker pull sameersbn/gitlab:11.1.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.1.3
+ sameersbn/gitlab:11.1.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.1.3
+    sameersbn/gitlab:11.1.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:sanitize
+    sameersbn/gitlab:11.1.4 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake db:setup
+    sameersbn/gitlab:11.1.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.1.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.1.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.3
+docker pull sameersbn/gitlab:11.1.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 427d8b7fb..342b3b3bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.3
+11.1.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ceb7d0e3..7e770a452 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.1.3
+    image: sameersbn/gitlab:11.1.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ab8058d31..0fc3fa47f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.3
+docker pull sameersbn/gitlab:11.1.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.1.3
+sameersbn/gitlab:11.1.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 206c1b6ee..3f7ce2257 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.1.3
+        image: sameersbn/gitlab:11.1.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 278443069f8c75f77ec66fa801d5c0acd0df65c5 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Tue, 31 Jul 2018 21:34:32 +0530
Subject: [PATCH 0018/1124] build: clean up unused artifacts leftover from the
 build stage

---
 assets/build/install.sh | 44 +++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index c1c42a33f..b604f3700 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -62,11 +62,15 @@ GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_
 GITLAB_WORKHORSE_VERSION=${GITLAB_WORKHOUSE_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_WORKHORSE_VERSION)}
 GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}
 
-#download golang
+# download golang
 echo "Downloading Go ${GOLANG_VERSION}..."
 wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/
 tar -xf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz -C /tmp/
 
+# setup go toolchain path
+export GOROOT=/tmp/go
+export PATH=${GOROOT}/bin:$PATH
+
 # install gitlab-shell
 echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..."
 mkdir -p ${GITLAB_SHELL_INSTALL_DIR}
@@ -76,47 +80,53 @@ rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz
 chown -R ${GITLAB_USER}: ${GITLAB_SHELL_INSTALL_DIR}
 
 cd ${GITLAB_SHELL_INSTALL_DIR}
-exec_as_git cp -a ${GITLAB_SHELL_INSTALL_DIR}/config.yml.example ${GITLAB_SHELL_INSTALL_DIR}/config.yml
+exec_as_git cp -a config.yml.example config.yml
 if [[ -x ./bin/compile ]]; then
   echo "Compiling gitlab-shell golang executables..."
-  exec_as_git PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go ./bin/compile
+  ./bin/compile
+  rm -rf go_build
 fi
-exec_as_git ./bin/install
+./bin/install
 
 # remove unused repositories directory created by gitlab-shell install
-exec_as_git rm -rf ${GITLAB_HOME}/repositories
+rm -rf ${GITLAB_HOME}/repositories
 
 # download gitlab-workhorse
 echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_INSTALL_DIR}
 chown -R ${GITLAB_USER}: ${GITLAB_WORKHORSE_INSTALL_DIR}
 
-#install gitlab-workhorse
-cd ${GITLAB_WORKHORSE_INSTALL_DIR}
-PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make install
+# install gitlab-workhorse
+make -C ${GITLAB_WORKHORSE_INSTALL_DIR} install
+
+# we don't need to keep the sources around
+rm -rf ${GITLAB_WORKHORSE_INSTALL_DIR}
 
 #download pages
 echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_INSTALL_DIR}
 chown -R ${GITLAB_USER}: ${GITLAB_PAGES_INSTALL_DIR}
 
-#install gitlab-pages
-cd ${GITLAB_PAGES_INSTALL_DIR}
-PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make
-cp -f gitlab-pages /usr/local/bin/
+# install gitlab-pages
+make -C ${GITLAB_PAGES_INSTALL_DIR}
+cp -f ${GITLAB_PAGES_INSTALL_DIR}/gitlab-pages /usr/local/bin/
+
+# we don't need to keep the sources around
+rm -rf ${GITLAB_PAGES_INSTALL_DIR}
 
 # download gitaly
 echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..."
 exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR}
+cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
 chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
-# copy default config for gitaly
-exec_as_git cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
 
 # install gitaly
 cd ${GITLAB_GITALY_INSTALL_DIR}
-ln -sf /tmp/go /usr/local/go
-PATH=/tmp/go/bin:$PATH make install && make clean
-rm -f /usr/local/go
+make install
+
+# cleanup unwanted stuff
+rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache
+make clean
 
 # remove go
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go

From bf5c5d3a2398ef23124902c1c646f41defcd8e4d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 1 Aug 2018 08:17:44 +0530
Subject: [PATCH 0019/1124] install: update gitlab-shell tarball url

---
 assets/build/install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index b604f3700..4732870a9 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -2,7 +2,7 @@
 set -e
 
 GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git
-GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz
+GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2
 GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git
 GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
 GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
@@ -74,9 +74,9 @@ export PATH=${GOROOT}/bin:$PATH
 # install gitlab-shell
 echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..."
 mkdir -p ${GITLAB_SHELL_INSTALL_DIR}
-wget -cq ${GITLAB_SHELL_URL}?ref=v${GITLAB_SHELL_VERSION} -O ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz
-tar xf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz --strip 1 -C ${GITLAB_SHELL_INSTALL_DIR}
-rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz
+wget -cq ${GITLAB_SHELL_URL} -O ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2
+tar xf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2 --strip 1 -C ${GITLAB_SHELL_INSTALL_DIR}
+rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2
 chown -R ${GITLAB_USER}: ${GITLAB_SHELL_INSTALL_DIR}
 
 cd ${GITLAB_SHELL_INSTALL_DIR}

From 3b17df4d95612676d9b766c762b80745509db39d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 1 Aug 2018 10:52:25 +0530
Subject: [PATCH 0020/1124] use GOROOT variable whenever possible

---
 assets/build/install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 4732870a9..bdd8de156 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -9,6 +9,11 @@ GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
 
 GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache"
 
+GOROOT=/tmp/go
+PATH=${GOROOT}/bin:$PATH
+
+export GOROOT PATH
+
 BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libc6-dev ruby${RUBY_VERSION}-dev \
   libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
@@ -67,10 +72,6 @@ echo "Downloading Go ${GOLANG_VERSION}..."
 wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/
 tar -xf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz -C /tmp/
 
-# setup go toolchain path
-export GOROOT=/tmp/go
-export PATH=${GOROOT}/bin:$PATH
-
 # install gitlab-shell
 echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..."
 mkdir -p ${GITLAB_SHELL_INSTALL_DIR}
@@ -129,7 +130,7 @@ rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache
 make clean
 
 # remove go
-rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go
+rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb

From a95766d652dc914e0c0c9c00f3f2bbb599edd9b9 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 1 Aug 2018 10:54:40 +0530
Subject: [PATCH 0021/1124] install: simplify gitlab-workhorse build steps

---
 Dockerfile              |  1 -
 assets/build/install.sh | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ed8f74e93..de718c9d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,6 @@ ENV GITLAB_VERSION=11.1.3 \
 
 ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
     GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \
-    GITLAB_WORKHORSE_INSTALL_DIR="${GITLAB_HOME}/gitlab-workhorse" \
     GITLAB_PAGES_INSTALL_DIR="${GITLAB_HOME}/gitlab-pages" \
     GITLAB_GITALY_INSTALL_DIR="${GITLAB_HOME}/gitaly" \
     GITLAB_DATA_DIR="${GITLAB_HOME}/data" \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index bdd8de156..f3634d84c 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -7,6 +7,8 @@ GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git
 GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
 GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
 
+GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse
+
 GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache"
 
 GOROOT=/tmp/go
@@ -94,14 +96,11 @@ rm -rf ${GITLAB_HOME}/repositories
 
 # download gitlab-workhorse
 echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..."
-exec_as_git git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_INSTALL_DIR}
-chown -R ${GITLAB_USER}: ${GITLAB_WORKHORSE_INSTALL_DIR}
-
-# install gitlab-workhorse
-make -C ${GITLAB_WORKHORSE_INSTALL_DIR} install
+git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_BUILD_DIR}
+make -C ${GITLAB_WORKHORSE_BUILD_DIR} install
 
-# we don't need to keep the sources around
-rm -rf ${GITLAB_WORKHORSE_INSTALL_DIR}
+# clean up
+rm -rf ${GITLAB_WORKHORSE_BUILD_DIR}
 
 #download pages
 echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..."

From 571334f97e3e6b8c61bd51b3d8bd977c493f4523 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 1 Aug 2018 10:55:19 +0530
Subject: [PATCH 0022/1124] install: simplify gitlab-pages build steps

---
 Dockerfile              |  1 -
 assets/build/install.sh | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de718c9d2..d8ff435d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,6 @@ ENV GITLAB_VERSION=11.1.3 \
 
 ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
     GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \
-    GITLAB_PAGES_INSTALL_DIR="${GITLAB_HOME}/gitlab-pages" \
     GITLAB_GITALY_INSTALL_DIR="${GITLAB_HOME}/gitaly" \
     GITLAB_DATA_DIR="${GITLAB_HOME}/data" \
     GITLAB_BUILD_DIR="${GITLAB_CACHE_DIR}/build" \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index f3634d84c..5479ce1ee 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -8,6 +8,7 @@ GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
 GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
 
 GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse
+GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages
 
 GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache"
 
@@ -102,17 +103,16 @@ make -C ${GITLAB_WORKHORSE_BUILD_DIR} install
 # clean up
 rm -rf ${GITLAB_WORKHORSE_BUILD_DIR}
 
-#download pages
+# download gitlab-pages
 echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..."
-exec_as_git git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_INSTALL_DIR}
-chown -R ${GITLAB_USER}: ${GITLAB_PAGES_INSTALL_DIR}
+git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_BUILD_DIR}
 
 # install gitlab-pages
-make -C ${GITLAB_PAGES_INSTALL_DIR}
-cp -f ${GITLAB_PAGES_INSTALL_DIR}/gitlab-pages /usr/local/bin/
+make -C ${GITLAB_PAGES_BUILD_DIR}
+cp -a ${GITLAB_PAGES_BUILD_DIR}/gitlab-pages /usr/local/bin/
 
-# we don't need to keep the sources around
-rm -rf ${GITLAB_PAGES_INSTALL_DIR}
+# clean up
+rm -rf ${GITLAB_PAGES_BUILD_DIR}
 
 # download gitaly
 echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..."

From cdfa19d4f1ff041bee160bc1148082ead023583a Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 1 Aug 2018 10:55:56 +0530
Subject: [PATCH 0023/1124] install: simplify and optimize gitaly installation
 directory contents

---
 assets/build/install.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 5479ce1ee..56a484f39 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -9,6 +9,7 @@ GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
 
 GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse
 GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages
+GITLAB_GITALY_BUILD_DIR=/tmp/gitaly
 
 GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache"
 
@@ -114,19 +115,20 @@ cp -a ${GITLAB_PAGES_BUILD_DIR}/gitlab-pages /usr/local/bin/
 # clean up
 rm -rf ${GITLAB_PAGES_BUILD_DIR}
 
-# download gitaly
+# download and build gitaly
 echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..."
-exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR}
-cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
-chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
+git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_BUILD_DIR}
 
 # install gitaly
-cd ${GITLAB_GITALY_INSTALL_DIR}
-make install
+make -C ${GITLAB_GITALY_BUILD_DIR} install
+mkdir -p ${GITLAB_GITALY_INSTALL_DIR}
+cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/
+cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
+rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache
+chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
 
-# cleanup unwanted stuff
-rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache
-make clean
+# clean up
+rm -rf ${GITLAB_GITALY_BUILD_DIR}
 
 # remove go
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}

From 70e4a0580fd24d384a726fc8e631b8b0dc412190 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 1 Aug 2018 22:16:38 +0200
Subject: [PATCH 0024/1124] release 11.1.4


From 4b2ff6da0b7f2639504e0eb81952750ca63f605c Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Thu, 9 Aug 2018 11:35:54 +0100
Subject: [PATCH 0025/1124] correction for parsing dates from backups files,
 due to format change in version 9.2

see:
https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-timestamp
https://github.com/sameersbn/docker-gitlab/issues/1414
https://github.com/sameersbn/docker-gitlab/issues/1042#issuecomment-271522064
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4797588dc..f51f2e796 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1721,7 +1721,7 @@ execute_raketask() {
       echo
       for b in $(ls ${GITLAB_BACKUP_DIR} | grep _gitlab_backup | sort -r)
       do
-        echo "‣ $b (created at $(date --date="@${b%%_gitlab_backup.tar}" +'%d %b, %G - %H:%M:%S %Z'))"
+        echo "‣ $b (created at $(date --date="@${b%%_*_gitlab_backup.tar}" +'%d %b, %G - %H:%M:%S %Z'))"
       done
       echo
 

From 79d73ab72b90003ec123c5a3c1fe627dab30e89c Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sun, 19 Aug 2018 17:06:22 +0530
Subject: [PATCH 0026/1124] integrate with circleci

---
 .circleci/config.yml | 71 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..802f07877
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,71 @@
+version: 2
+jobs:
+  build:
+    working_directory: /workdir
+    docker:
+      - image: docker:17.06.0-ce-git
+        environment:
+          IMAGE_NAME: "sameersbn/gitlab"
+
+    steps:
+      - checkout
+
+      - setup_remote_docker:
+          version: 17.06.0-ce
+
+      - run:
+          name: Docker info
+          command: |
+            docker version
+            docker info
+
+      - restore_cache:
+          keys:
+            - cache-{{ .Branch }}
+          paths:
+            - /cache/layers.tar
+
+      - run:
+          name: Loading docker cache
+          command: |
+            if [[ -f /cache/layers.tar ]]; then
+              docker load -i /cache/layers.tar
+            fi
+
+      - run:
+          name: Build docker image
+          command: |
+            docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} .
+
+      - run:
+          name: Launching container for testing
+          command: |
+            docker network create testnet
+            docker run --name gitlab -d --net testnet ${IMAGE_NAME}
+
+      - run:
+          name: Testing image
+          command: |
+            echo "TODO"
+
+      - run:
+          name: Generate docker build image cache
+          command: |
+            mkdir -p /cache
+            docker save -o /cache/layers.tar ${IMAGE_NAME}
+
+      - save_cache:
+          key: cache-{{ .Branch }}-{{ epoch }}
+          paths:
+            - /cache/layers.tar
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              only: /.*/

From d4767da8f2d49597e14ebb983f8949e688f1495d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Thu, 23 Aug 2018 16:18:41 +0530
Subject: [PATCH 0027/1124] remove travis integration

---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 61c89824c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-sudo: required
-
-language: bash
-
-services:
-  - docker
-
-script:
- - docker build -t sammeersbn/gitlab .

From 5e1b586b33d2cff58f3f759f458ecf317b441b6e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 22 Aug 2018 08:59:12 +0200
Subject: [PATCH 0028/1124] Upgrade GitLab CE to 11.2.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d47007e6e..32fee8a77 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.2.0**
+- gitlab: upgrade CE to v11.2.0
+
 **11.1.4**
 - gitlab: upgrade CE to v11.1.4
 
diff --git a/Dockerfile b/Dockerfile
index 18dd51d98..9489c40da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.1.4 \
+ENV GITLAB_VERSION=11.2.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=7.1.4 \
diff --git a/README.md b/README.md
index a6ec43b43..ecfb458e9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.1.4
+# sameersbn/gitlab:11.2.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.1.4
+docker pull sameersbn/gitlab:11.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.1.4
+ sameersbn/gitlab:11.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.1.4
+    sameersbn/gitlab:11.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:sanitize
+    sameersbn/gitlab:11.2.0 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake db:setup
+    sameersbn/gitlab:11.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.1.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.4
+docker pull sameersbn/gitlab:11.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 342b3b3bc..b85c6c7b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.4
+11.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e770a452..ea8143834 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.1.4
+    image: sameersbn/gitlab:11.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0fc3fa47f..3c2091473 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.1.4
+docker pull sameersbn/gitlab:11.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.1.4
+sameersbn/gitlab:11.2.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3f7ce2257..7c616e6ed 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.1.4
+        image: sameersbn/gitlab:11.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 2c22cf8f9c76968e8768f8e0b361852a2e2cd104 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 22 Aug 2018 09:00:22 +0200
Subject: [PATCH 0029/1124] Update gitlab-shell to 8.1.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9489c40da..7c5d072d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.2.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITLAB_SHELL_VERSION=7.1.4 \
     GITLAB_WORKHORSE_VERSION=5.0.0 \
+    GITLAB_SHELL_VERSION=8.1.1 \
     GITLAB_PAGES_VERSION=1.0.0 \
     GITALY_SERVER_VERSION=0.111.2 \
     GITLAB_USER="git" \

From fe6740a90fc698933370f34ce24900cd5e186043 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 22 Aug 2018 09:00:36 +0200
Subject: [PATCH 0030/1124] Update gitlab-workhorse to 5.1.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7c5d072d1..1a312c1e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.2.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITLAB_WORKHORSE_VERSION=5.0.0 \
     GITLAB_SHELL_VERSION=8.1.1 \
+    GITLAB_WORKHORSE_VERSION=5.1.0 \
     GITLAB_PAGES_VERSION=1.0.0 \
     GITALY_SERVER_VERSION=0.111.2 \
     GITLAB_USER="git" \

From 600255321629796ed3a5a9c2a23a24f1b612afd5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 22 Aug 2018 09:00:54 +0200
Subject: [PATCH 0031/1124] Update gitaly to 0.117.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1a312c1e1..7b73ba599 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.2.0 \
     GITLAB_SHELL_VERSION=8.1.1 \
     GITLAB_WORKHORSE_VERSION=5.1.0 \
     GITLAB_PAGES_VERSION=1.0.0 \
-    GITALY_SERVER_VERSION=0.111.2 \
+    GITALY_SERVER_VERSION=0.117.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 0de94d23d1cf1c3065a39ac54bf474c9d58481ac Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 24 Aug 2018 21:54:36 +0200
Subject: [PATCH 0032/1124] Update baseimage to xenial-20180808

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

diff --git a/Dockerfile b/Dockerfile
index 7b73ba599..56906a276 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20180705
+FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 

From 91e05e4489a5e62602b7229dabeef73e5cf9ff4d Mon Sep 17 00:00:00 2001
From: Tobias Haber <t.haber@division.ag>
Date: Tue, 3 Jul 2018 15:32:40 +0200
Subject: [PATCH 0033/1124] Add GITLAB_DEFAULT_THEME

---
 assets/runtime/config/gitlabhq/gitlab.yml | 21 ++++++++++++++-------
 assets/runtime/env-defaults               |  2 +-
 assets/runtime/functions                  |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 55804be20..721450af5 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -26,6 +26,8 @@ production: &base
   # 1. GitLab app settings
   # ==========================
 
+
+
   ## GitLab settings
   gitlab:
     ## Web server settings (note: host is the FQDN, do not include http://)
@@ -75,13 +77,18 @@ production: &base
     default_can_create_group: {{GITLAB_CREATE_GROUP}}  # default: true
     username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace
     ## Default theme ID
-    ##   1 - Graphite
-    ##   2 - Charcoal
-    ##   3 - Green
-    ##   4 - Gray
-    ##   5 - Violet
-    ##   6 - Blue
-    # default_theme: 2 # default: 2
+    ##   1 - Indigo
+    ##   2 - Dark
+    ##   3 - Light
+    ##   4 - Blue
+    ##   5 - Green
+    ##   6 - Light Indigo
+    ##   7 - Light Blue
+    ##   8 - Light Green
+    ##   9 - Red
+    ##   10 - Light Red
+    default_theme: {{GITLAB_DEFAULT_THEME}}
+
 
     # Enable or disable user signups (first run only)
     signup_enabled: {{GITLAB_SIGNUP_ENABLED}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index f419afa10..0330ebd15 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -9,7 +9,7 @@ GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}"
 GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}"
 GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
 GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}"
-
+GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2}
 GITLAB_HTTPS=${GITLAB_HTTPS:-false}
 GITLAB_HOST=${GITLAB_HOST:-localhost}
 GITLAB_CI_HOST=${GITLAB_CI_HOST:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4797588dc..dd7cea6c4 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1519,6 +1519,7 @@ configure_gitlab() {
     GITLAB_SIGNUP_ENABLED \
     GITLAB_PROJECTS_LIMIT \
     GITLAB_USERNAME_CHANGE \
+    GITLAB_DEFAULT_THEME \
     GITLAB_CREATE_GROUP 
 
   gitlab_configure_database

From 40e5baf8e6a6d0ad5b7fbb4a4de99ce7e14e6d92 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <github@mietz.io>
Date: Sat, 1 Sep 2018 11:02:04 +0200
Subject: [PATCH 0034/1124] Update Changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 32fee8a77..23c15c0bb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.2.0**
 - gitlab: upgrade CE to v11.2.0
+- ADD `GITLAB_DEFAULT_THEME`
 
 **11.1.4**
 - gitlab: upgrade CE to v11.1.4

From 912b7036ed21b5d909e6414cae85b52c620acd44 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 11:07:54 +0200
Subject: [PATCH 0035/1124] release 11.2.0


From 43c9bccf0bfaea85b8f1ebb88e3b270cb8365532 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 11:15:19 +0200
Subject: [PATCH 0036/1124] Upgrade GitLab CE to 11.2.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 23c15c0bb..833dabd87 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.2.1**
+- gitlab: upgrade CE to v11.2.1
+
 **11.2.0**
 - gitlab: upgrade CE to v11.2.0
 - ADD `GITLAB_DEFAULT_THEME`
diff --git a/Dockerfile b/Dockerfile
index 875a71b11..fe60b4d35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.2.0 \
+ENV GITLAB_VERSION=11.2.1 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.1.1 \
diff --git a/README.md b/README.md
index ecfb458e9..b812e22ae 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.2.0
+# sameersbn/gitlab:11.2.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.2.0
+docker pull sameersbn/gitlab:11.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.2.0
+ sameersbn/gitlab:11.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.2.0
+    sameersbn/gitlab:11.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:sanitize
+    sameersbn/gitlab:11.2.1 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake db:setup
+    sameersbn/gitlab:11.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.0
+docker pull sameersbn/gitlab:11.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b85c6c7b0..dc170a12a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.0
+11.2.1
diff --git a/docker-compose.yml b/docker-compose.yml
index ea8143834..2e6961905 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.2.0
+    image: sameersbn/gitlab:11.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3c2091473..5327cd82b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.0
+docker pull sameersbn/gitlab:11.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.2.0
+sameersbn/gitlab:11.2.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7c616e6ed..1b5713f22 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.2.0
+        image: sameersbn/gitlab:11.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 675693448eed50ab7b4b231ff8105d61708eae4c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 11:54:24 +0200
Subject: [PATCH 0037/1124] release 11.2.1


From 085a1aa7a1085ddeb43bcd023e45df3a3b59dd5e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 11:55:51 +0200
Subject: [PATCH 0038/1124] Upgrade GitLab CE to 11.2.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 833dabd87..f44efbfc7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.2.2**
+- gitlab: upgrade CE to v11.2.2
+
 **11.2.1**
 - gitlab: upgrade CE to v11.2.1
 
diff --git a/Dockerfile b/Dockerfile
index fe60b4d35..ddb9d2591 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.2.1 \
+ENV GITLAB_VERSION=11.2.2 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.1.1 \
diff --git a/README.md b/README.md
index b812e22ae..d60ef006d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.2.1
+# sameersbn/gitlab:11.2.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.2.1
+docker pull sameersbn/gitlab:11.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.2.1
+ sameersbn/gitlab:11.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.2.1
+    sameersbn/gitlab:11.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:sanitize
+    sameersbn/gitlab:11.2.2 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake db:setup
+    sameersbn/gitlab:11.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.1
+docker pull sameersbn/gitlab:11.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index dc170a12a..21198965d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.1
+11.2.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e6961905..56b87e231 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.2.1
+    image: sameersbn/gitlab:11.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5327cd82b..77deec15c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.1
+docker pull sameersbn/gitlab:11.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.2.1
+sameersbn/gitlab:11.2.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1b5713f22..1f5802c7a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.2.1
+        image: sameersbn/gitlab:11.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 19826039b0ed19ab839a0ff44f1de697b4d1ef81 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 12:11:05 +0200
Subject: [PATCH 0039/1124] release 11.2.2


From 11d98205c87e6ae375703769cc35828daf90d72f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 12:12:26 +0200
Subject: [PATCH 0040/1124] Upgrade GitLab CE to 11.2.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f44efbfc7..a66c8b041 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.2.3**
+- gitlab: upgrade CE to v11.2.3
+
 **11.2.2**
 - gitlab: upgrade CE to v11.2.2
 
diff --git a/Dockerfile b/Dockerfile
index ddb9d2591..04d04ebd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.2.2 \
+ENV GITLAB_VERSION=11.2.3 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.1.1 \
diff --git a/README.md b/README.md
index d60ef006d..6ea570656 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.2.2
+# sameersbn/gitlab:11.2.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.2.2
+docker pull sameersbn/gitlab:11.2.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.2.2
+ sameersbn/gitlab:11.2.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.2.2
+    sameersbn/gitlab:11.2.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:sanitize
+    sameersbn/gitlab:11.2.3 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake db:setup
+    sameersbn/gitlab:11.2.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.2.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.2
+docker pull sameersbn/gitlab:11.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 21198965d..1a8d32222 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.2
+11.2.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 56b87e231..7f6815edb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.2.2
+    image: sameersbn/gitlab:11.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 77deec15c..87787bac2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.2
+docker pull sameersbn/gitlab:11.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.2.2
+sameersbn/gitlab:11.2.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1f5802c7a..3f53c2630 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.2.2
+        image: sameersbn/gitlab:11.2.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 5ee7b1d0bbdc02d491353f2596130ab96a84d953 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Sep 2018 12:27:48 +0200
Subject: [PATCH 0041/1124] release 11.2.3


From 56b6c4245c59c9db177632505a099f3bb64c1bad Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Tue, 18 Sep 2018 17:03:10 +0200
Subject: [PATCH 0042/1124] Fix backup config stripping for when AWS & GCS are
 disabled

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index dd7cea6c4..37a32b4d6 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -859,7 +859,7 @@ gitlab_configure_backups() {
     GITLAB_BACKUP_ARCHIVE_PERMISSIONS
   gitlab_configure_backups_schedule
   if [[ ${AWS_BACKUPS} != true && ${GCS_BACKUPS} != true ]]; then
-    exec_as_git sed -i "/upload:/,/#end-gcs/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/\s\+upload:/,/#end-gcs/d" ${GITLAB_CONFIG}
     return 0
   fi
   if [[ ${AWS_BACKUPS} == true && ${GCS_BACKUPS} == true ]]; then

From 4e9f51ef0adefe23be128b8a0f108c05cd18c788 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 08:53:49 +0200
Subject: [PATCH 0043/1124] Upgrade GitLab CE to 11.3.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a66c8b041..411d33f2c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.0**
+- gitlab: upgrade CE to v11.3.0
+
 **11.2.3**
 - gitlab: upgrade CE to v11.2.3
 
diff --git a/Dockerfile b/Dockerfile
index 04d04ebd9..96e2005c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.2.3 \
+ENV GITLAB_VERSION=11.3.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.1.1 \
diff --git a/README.md b/README.md
index 6ea570656..9bfeee286 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.2.3
+# sameersbn/gitlab:11.3.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.2.3
+docker pull sameersbn/gitlab:11.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.2.3
+ sameersbn/gitlab:11.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.2.3
+    sameersbn/gitlab:11.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:sanitize
+    sameersbn/gitlab:11.3.0 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake db:setup
+    sameersbn/gitlab:11.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.3
+docker pull sameersbn/gitlab:11.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1a8d32222..f628d2eaf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.2.3
+11.3.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 7f6815edb..14c2d132a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.2.3
+    image: sameersbn/gitlab:11.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 87787bac2..1de1e9d55 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.2.3
+docker pull sameersbn/gitlab:11.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.2.3
+sameersbn/gitlab:11.3.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3f53c2630..7bfcb08a5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.2.3
+        image: sameersbn/gitlab:11.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 06a27a6844b8865f48bf2c8694799c0448d5b8cc Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 08:54:56 +0200
Subject: [PATCH 0044/1124] Update gitlab-shell to 8.3.3

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 96e2005c7..4392bddc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.3.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITLAB_SHELL_VERSION=8.1.1 \
     GITLAB_WORKHORSE_VERSION=5.1.0 \
     GITLAB_PAGES_VERSION=1.0.0 \
     GITALY_SERVER_VERSION=0.117.2 \
+    GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 77e9a42b293abd40bd584f2cca032259e54d0520 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 08:55:13 +0200
Subject: [PATCH 0045/1124] Update gitlab-workhorse to 6.1.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4392bddc8..3352982b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.3.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITLAB_WORKHORSE_VERSION=5.1.0 \
     GITLAB_PAGES_VERSION=1.0.0 \
     GITALY_SERVER_VERSION=0.117.2 \
     GITLAB_SHELL_VERSION=8.3.3 \
+    GITLAB_WORKHORSE_VERSION=6.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From c788356f8687c433310a96b084fb7e3d9a9af27d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 08:55:27 +0200
Subject: [PATCH 0046/1124] Update gitlab-pages to 1.1.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3352982b9..cb01b5d60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.3.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITLAB_PAGES_VERSION=1.0.0 \
     GITALY_SERVER_VERSION=0.117.2 \
     GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=6.1.0 \
+    GITLAB_PAGES_VERSION=1.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 42708dd8a0b2318c388da68681ff79e07fa1f0bb Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 08:55:41 +0200
Subject: [PATCH 0047/1124] Update gitlay to 0.120.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cb01b5d60..8e7585cc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com"
 ENV GITLAB_VERSION=11.3.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
-    GITALY_SERVER_VERSION=0.117.2 \
     GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=6.1.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
+    GITALY_SERVER_VERSION=0.120.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 5efa8619af46c124b656f8b0861fbbc9bc0a424b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 09:14:04 +0200
Subject: [PATCH 0048/1124] Fix gitaly-ssh missing symlink

* Opening a merge request from a branch within my fork towards the master of the upstream repo, this results in 503 errors.

* Updating existing cross-fork merge request with new commits, they do not show up in the merge requests, neither do the diffs.
However, the branch in the fork shows the newly added commit.

FIXES #1721, #1712
---
 assets/build/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 56a484f39..7fc7c7a6d 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -133,6 +133,10 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR}
 # remove go
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
+# Fix for rebase in forks 
+echo "Linking $(which gitaly-ssh) to /"
+ln -s $(which gitaly-ssh) /
+
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb
 

From 923b98eab0a0f11286fdfada91a0d4980c269c4f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 09:47:28 +0200
Subject: [PATCH 0049/1124] Update Changelog

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 411d33f2c..925126c61 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,9 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.3.0**
 - gitlab: upgrade CE to v11.3.0
+- Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
+- Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699)
+- Fix gitlay-ssh symlink to enable rebase/squash in forks 
 
 **11.2.3**
 - gitlab: upgrade CE to v11.2.3

From abb4aaad8f1c5f360b1a209b66c7469e7ce5b939 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 22 Sep 2018 09:48:58 +0200
Subject: [PATCH 0050/1124] release 11.3.0


From bda29aef719000a3c2dcbc21688b61d6fe614c70 Mon Sep 17 00:00:00 2001
From: Even Holthe <even.holthe@me.com>
Date: Mon, 1 Oct 2018 21:28:05 +0200
Subject: [PATCH 0051/1124] Upgrade GitLab to 11.3.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 925126c61..3e0799870 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.1**
+- gitlab: upgrade CE to v11.3.1
+
 **11.3.0**
 - gitlab: upgrade CE to v11.3.0
 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
diff --git a/Dockerfile b/Dockerfile
index 8e7585cc6..a93b1be3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.0 \
+ENV GITLAB_VERSION=11.3.1 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 9bfeee286..ce3366588 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.0
+# sameersbn/gitlab:11.3.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.0
+docker pull sameersbn/gitlab:11.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.0
+ sameersbn/gitlab:11.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.0
+    sameersbn/gitlab:11.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:sanitize
+    sameersbn/gitlab:11.3.1 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake db:setup
+    sameersbn/gitlab:11.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.0
+docker pull sameersbn/gitlab:11.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index f628d2eaf..0a47c95bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.0
+11.3.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 14c2d132a..0648ba469 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.0
+    image: sameersbn/gitlab:11.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1de1e9d55..f6383034b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.0
+docker pull sameersbn/gitlab:11.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.0
+sameersbn/gitlab:11.3.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7bfcb08a5..b7af19f98 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.0
+        image: sameersbn/gitlab:11.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 19ca9e11c6b0733963dfa9d52f28bfed77f1d1ad Mon Sep 17 00:00:00 2001
From: Even Holthe <even.holthe@me.com>
Date: Mon, 1 Oct 2018 21:31:20 +0200
Subject: [PATCH 0052/1124] Upgrade Gitaly to 0.120.1

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

diff --git a/Dockerfile b/Dockerfile
index a93b1be3a..91a4e85da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.3.1 \
     GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=6.1.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
-    GITALY_SERVER_VERSION=0.120.0 \
+    GITALY_SERVER_VERSION=0.120.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From ab2fbb167430d9050891b1d1ad3455973aba4708 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 3 Oct 2018 17:40:47 +0200
Subject: [PATCH 0053/1124] release 11.3.1


From 8832dd221e54e37e4ee7676132ff4512a360bda8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 3 Oct 2018 17:42:42 +0200
Subject: [PATCH 0054/1124] Upgrade GitLab CE to 11.3.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3e0799870..b85bd34d5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.2**
+- gitlab: upgrade CE to v11.3.2
+
 **11.3.1**
 - gitlab: upgrade CE to v11.3.1
 
diff --git a/Dockerfile b/Dockerfile
index 91a4e85da..b7e9e2507 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.1 \
+ENV GITLAB_VERSION=11.3.2 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index ce3366588..147a90f01 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.1
+# sameersbn/gitlab:11.3.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.1
+docker pull sameersbn/gitlab:11.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.1
+ sameersbn/gitlab:11.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.1
+    sameersbn/gitlab:11.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:sanitize
+    sameersbn/gitlab:11.3.2 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake db:setup
+    sameersbn/gitlab:11.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.1
+docker pull sameersbn/gitlab:11.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 0a47c95bb..e21e53d29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.1
+11.3.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 0648ba469..8990993d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.1
+    image: sameersbn/gitlab:11.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f6383034b..85ef79acb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.1
+docker pull sameersbn/gitlab:11.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.1
+sameersbn/gitlab:11.3.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b7af19f98..f91e9194f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.1
+        image: sameersbn/gitlab:11.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 003d1c31ad6c0f81267073420eeb3ee156f9fd5a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 3 Oct 2018 18:19:50 +0200
Subject: [PATCH 0055/1124] release 11.3.2


From cd9c21ab4be1f9f63a308d499842a740edea49be Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 4 Oct 2018 11:08:12 +0200
Subject: [PATCH 0056/1124] Upgrade GitLab CE to 11.3.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b85bd34d5..5f9a9ea16 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.3**
+- gitlab: upgrade CE to v11.3.3
+
 **11.3.2**
 - gitlab: upgrade CE to v11.3.2
 
diff --git a/Dockerfile b/Dockerfile
index b7e9e2507..2fe1d175e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.2 \
+ENV GITLAB_VERSION=11.3.3 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 147a90f01..bdd8c2d29 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.2
+# sameersbn/gitlab:11.3.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.2
+docker pull sameersbn/gitlab:11.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.2
+ sameersbn/gitlab:11.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.2
+    sameersbn/gitlab:11.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:sanitize
+    sameersbn/gitlab:11.3.3 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake db:setup
+    sameersbn/gitlab:11.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.2
+docker pull sameersbn/gitlab:11.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e21e53d29..3cbff0bc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.2
+11.3.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 8990993d4..769ef92d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.2
+    image: sameersbn/gitlab:11.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 85ef79acb..6681f2d27 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.2
+docker pull sameersbn/gitlab:11.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.2
+sameersbn/gitlab:11.3.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f91e9194f..4af94e384 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.2
+        image: sameersbn/gitlab:11.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 1f095399d259f4ddeb80619d1fa01572fdea58b3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 5 Oct 2018 03:40:25 +0200
Subject: [PATCH 0057/1124] release 11.3.3


From 3d9db85f3078a7fb926c7030568034dbd648b99b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 5 Oct 2018 20:43:40 +0200
Subject: [PATCH 0058/1124] Upgrade GitLab CE to 11.3.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5f9a9ea16..63c4c8c25 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.4**
+- gitlab: upgrade CE to v11.3.4
+
 **11.3.3**
 - gitlab: upgrade CE to v11.3.3
 
diff --git a/Dockerfile b/Dockerfile
index 2fe1d175e..2a42fe7bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.3 \
+ENV GITLAB_VERSION=11.3.4 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index bdd8c2d29..6d65db588 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.3
+# sameersbn/gitlab:11.3.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.3
+docker pull sameersbn/gitlab:11.3.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.3
+ sameersbn/gitlab:11.3.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.3
+    sameersbn/gitlab:11.3.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:sanitize
+    sameersbn/gitlab:11.3.4 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake db:setup
+    sameersbn/gitlab:11.3.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.3
+docker pull sameersbn/gitlab:11.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 3cbff0bc7..52025c04a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.3
+11.3.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 769ef92d5..1643a55e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.3
+    image: sameersbn/gitlab:11.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6681f2d27..e87314517 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.3
+docker pull sameersbn/gitlab:11.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.3
+sameersbn/gitlab:11.3.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4af94e384..9a83a49a1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.3
+        image: sameersbn/gitlab:11.3.4
         env:
         - name: TZ
           value: Asia/Kolkata

From f5f3ddd40b9c27064b71458fadab896222677f5d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 7 Oct 2018 01:30:56 +0200
Subject: [PATCH 0059/1124] release 11.3.4


From 6d6976c08b801229dc620fb0f86f88ee8c739085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Klein?= <contact@stephane-klein.info>
Date: Sun, 16 Sep 2018 16:37:41 +0200
Subject: [PATCH 0060/1124] Add %h/.ssh/authorized_keys_proxy to
 AuthorizedKeysFile parameter in /etc/ssh/sshd_config to support ssh host
 forwarding to GitLab container

---
 assets/build/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 7fc7c7a6d..2216a6982 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -210,6 +210,7 @@ sed -i \
   -e "s|^[#]*UsePrivilegeSeparation yes|UsePrivilegeSeparation no|" \
   -e "s|^[#]*PasswordAuthentication yes|PasswordAuthentication no|" \
   -e "s|^[#]*LogLevel INFO|LogLevel VERBOSE|" \
+  -e "s|^[#]*AuthorizedKeysFile.*|AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_proxy|" \
   /etc/ssh/sshd_config
 echo "UseDNS no" >> /etc/ssh/sshd_config
 

From 5a477cbb373bfcb7a22e84a4ad4ed81c8ac420a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Klein?= <contact@stephane-klein.info>
Date: Sun, 30 Sep 2018 22:02:26 +0200
Subject: [PATCH 0061/1124] =?UTF-8?q?Add=20=C2=AB=20Exposing=20ssh=20port?=
 =?UTF-8?q?=20in=20dockerized=20gitlab-ce=20=C2=BB=20section=20in=20README?=
 =?UTF-8?q?=20and=20contrib/expose-gitlab-ssh-port.sh=20configuration=20sc?=
 =?UTF-8?q?ript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |  2 ++
 contrib/expose-gitlab-ssh-port.sh | 33 +++++++++++++++++++++++++++++++
 docs/exposing-ssh-port.md         |  8 ++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 contrib/expose-gitlab-ssh-port.sh
 create mode 100644 docs/exposing-ssh-port.md

diff --git a/README.md b/README.md
index 6d65db588..eb8d5a13a 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
     - [Piwik](#piwik)
+    - [Exposing ssh port in dockerized gitlab-ce](docs/exposing-ssh-port.md)
     - [Available Configuration Parameters](#available-configuration-parameters)
 - [Maintenance](#maintenance)
     - [Creating Backups](#creating-backups)
@@ -801,6 +802,7 @@ These options should contain something like:
 - `PIWIK_URL=piwik.example.org`
 - `PIWIK_SITE_ID=42`
 
+
 ### Available Configuration Parameters
 
 *Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)*
diff --git a/contrib/expose-gitlab-ssh-port.sh b/contrib/expose-gitlab-ssh-port.sh
new file mode 100644
index 000000000..51f5339ec
--- /dev/null
+++ b/contrib/expose-gitlab-ssh-port.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -ev
+
+GITLAB_USERGROUP=${GITLAB_USERGROUP:-1010}
+GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-9922}
+
+if ! id -u git >> /dev/null 2>&1; then
+  groupadd -g ${GITLAB_USERGROUP} git
+  useradd -m -u ${GITLAB_USERGROUP} -g git -s /bin/sh -d /home/git git
+fi
+su git -c "mkdir -p /home/git/.ssh/"
+
+su git -c "if [ ! -f /home/git/.ssh/id_rsa ]; then ssh-keygen -t rsa -b 4096 -N \"\" -f /home/git/.ssh/id_rsa; fi"
+su git -c "if [ -f /home/git/.ssh/id_rsa.pub ]; then mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys_proxy; fi"
+
+mkdir -p /home/git/gitlab-shell/bin/
+rm -f /home/git/gitlab-shell/bin/gitlab-shell
+tee -a /home/git/gitlab-shell/bin/gitlab-shell > /dev/null <<EOF
+#!/bin/sh
+
+ssh -i /home/git/.ssh/id_rsa -p ${GITLAB_SSH_PORT} -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"\$SSH_ORIGINAL_COMMAND\" \$0 \$@"
+EOF
+chown git:git /home/git/gitlab-shell/bin/gitlab-shell
+chmod u+x /home/git/gitlab-shell/bin/gitlab-shell
+
+mkdir -p /var/lib/gitlab/data/.ssh/
+chown git:git -R /var/lib/gitlab/data/.ssh/
+chown git:git -R /home/git/.ssh
+su git -c "touch /var/lib/gitlab/data/.ssh/authorized_keys"
+rm -f /home/git/.ssh/authorized_keys
+su git -c "ln -s /var/lib/gitlab/data/.ssh/authorized_keys /home/git/.ssh/authorized_keys"
+
+echo "Next start GitLab container"
diff --git a/docs/exposing-ssh-port.md b/docs/exposing-ssh-port.md
new file mode 100644
index 000000000..9c37baee6
--- /dev/null
+++ b/docs/exposing-ssh-port.md
@@ -0,0 +1,8 @@
+# Exposing ssh port in dockerized gitlab-ce
+
+This is how to expose this internal ssh port without affecting the existing ssh port on the host server:
+
+* use this configuration script: [`../contrib/expose-gitlab-ssh-port.sh`](../contrib/expose-gitlab-ssh-port.sh)
+* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test
+](https://github.com/harobed/docker-gitlab-vagrant-test)
+* more information, see [« Exposing ssh port in dockerized gitlab-ce »](https://blog.xiaket.org/2017/exposing.ssh.port.in.dockerized.gitlab-ce.html) post

From 3f08f58ad7bdb895631c9de3df78b0a5195a987b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 15 Oct 2018 15:44:00 +0200
Subject: [PATCH 0062/1124] Upgrade GitLab CE to 11.3.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 63c4c8c25..c0658249e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.5**
+- gitlab: upgrade CE to v11.3.5
+
 **11.3.4**
 - gitlab: upgrade CE to v11.3.4
 
diff --git a/Dockerfile b/Dockerfile
index 2a42fe7bb..b523521cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.4 \
+ENV GITLAB_VERSION=11.3.5 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 6d65db588..36e8ca53f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.4
+# sameersbn/gitlab:11.3.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.4
+docker pull sameersbn/gitlab:11.3.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.4
+ sameersbn/gitlab:11.3.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.4
+    sameersbn/gitlab:11.3.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:sanitize
+    sameersbn/gitlab:11.3.5 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake db:setup
+    sameersbn/gitlab:11.3.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.4
+docker pull sameersbn/gitlab:11.3.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 52025c04a..96d641b79 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.4
+11.3.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 1643a55e3..cf663026d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.4
+    image: sameersbn/gitlab:11.3.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e87314517..f8c157726 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.4
+docker pull sameersbn/gitlab:11.3.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.4
+sameersbn/gitlab:11.3.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9a83a49a1..46f7ad193 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.4
+        image: sameersbn/gitlab:11.3.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 3e8f11f91752ba022e1d466d2f9f2c4877472dab Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 17 Oct 2018 20:12:54 +0200
Subject: [PATCH 0063/1124] release 11.3.5


From e312966190f1cfafe046edede69747145e6774cf Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 17 Oct 2018 20:14:21 +0200
Subject: [PATCH 0064/1124] Upgrade GitLab CE to 11.3.6

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c0658249e..e4d54378c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.3.6**
+- gitlab: upgrade CE to v11.3.6
+
 **11.3.5**
 - gitlab: upgrade CE to v11.3.5
 
diff --git a/Dockerfile b/Dockerfile
index b523521cd..a9277c68b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.5 \
+ENV GITLAB_VERSION=11.3.6 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 36e8ca53f..618532ec4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.5
+# sameersbn/gitlab:11.3.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.5
+docker pull sameersbn/gitlab:11.3.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.5
+ sameersbn/gitlab:11.3.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.5
+    sameersbn/gitlab:11.3.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:sanitize
+    sameersbn/gitlab:11.3.6 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake db:setup
+    sameersbn/gitlab:11.3.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.3.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.3.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.5
+docker pull sameersbn/gitlab:11.3.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 96d641b79..e9d882228 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.5
+11.3.6
diff --git a/docker-compose.yml b/docker-compose.yml
index cf663026d..1d1232da6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.5
+    image: sameersbn/gitlab:11.3.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f8c157726..c13d54e91 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.5
+docker pull sameersbn/gitlab:11.3.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.5
+sameersbn/gitlab:11.3.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 46f7ad193..1de07094f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.5
+        image: sameersbn/gitlab:11.3.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 6d3b453e3a673be0b4170eafa8e6428118695a47 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 15 Oct 2018 17:11:33 +0200
Subject: [PATCH 0065/1124] Replace docker image with circleci image

This will include also docker-compose so we can easier test the application.

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 802f07877..26898fc72 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,8 @@
 version: 2
 jobs:
   build:
-    working_directory: /workdir
     docker:
-      - image: docker:17.06.0-ce-git
+      - image: circleci/golang:1-stretch-browsers-legacy
         environment:
           IMAGE_NAME: "sameersbn/gitlab"
 

From 7af34a73b323278be729b4908643f5e6144f7707 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 15 Oct 2018 17:12:37 +0200
Subject: [PATCH 0066/1124] Enable build for all branches

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26898fc72..d02516bcc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,9 +62,4 @@ workflows:
   version: 2
   build-and-test:
     jobs:
-      - build:
-          filters:
-            branches:
-              only: /.*/
-            tags:
-              only: /.*/
+      - build

From e81492dc8eea5ac50aa21be16ffdf3f7a17a577c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 15 Oct 2018 17:13:01 +0200
Subject: [PATCH 0067/1124] Add simple test if gitlab starts after the changes

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d02516bcc..851f63bcd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
       - checkout
 
       - setup_remote_docker:
-          version: 17.06.0-ce
+          version: 18.03.1-ce
 
       - run:
           name: Docker info
@@ -18,17 +18,22 @@ jobs:
             docker version
             docker info
 
+
       - restore_cache:
           keys:
             - cache-{{ .Branch }}
           paths:
-            - /cache/layers.tar
+            - /tmp/cache/layers.tar
 
       - run:
           name: Loading docker cache
           command: |
-            if [[ -f /cache/layers.tar ]]; then
-              docker load -i /cache/layers.tar
+            if [[ -f /tmp/cache/layers.tar ]]; then
+              echo "Loading cache ..."
+              docker load -i /tmp/cache/layers.tar
+              docker image ls
+            else
+              echo "Couldn't find any caches"
             fi
 
       - run:
@@ -39,24 +44,25 @@ jobs:
       - run:
           name: Launching container for testing
           command: |
-            docker network create testnet
-            docker run --name gitlab -d --net testnet ${IMAGE_NAME}
+            docker-compose up -d
+            sleep 10
 
       - run:
           name: Testing image
           command: |
-            echo "TODO"
+            docker run --network container:$(docker-compose ps -q gitlab) \
+              appropriate/curl --retry 12 --retry-delay 5 --retry-connrefused http://localhost/explore
 
       - run:
           name: Generate docker build image cache
           command: |
-            mkdir -p /cache
-            docker save -o /cache/layers.tar ${IMAGE_NAME}
+            mkdir -p /tmp/cache/
+            docker save -o /tmp/cache/layers.tar ${IMAGE_NAME}
 
       - save_cache:
           key: cache-{{ .Branch }}-{{ epoch }}
           paths:
-            - /cache/layers.tar
+            - /tmp/cache/layers.tar
 
 workflows:
   version: 2

From fd96c7dad0990f281a2600453a9453218f9a9104 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:41:26 +0200
Subject: [PATCH 0068/1124] release 11.3.6


From a05c932bda2194b5c9443a24fcc4222fd7b445ef Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:46:35 +0200
Subject: [PATCH 0069/1124] Upgrade GitLab CE to 11.4.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4d54378c..946bd3f6f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.0**
+- gitlab: upgrade CE to v11.4.0
+
 **11.3.6**
 - gitlab: upgrade CE to v11.3.6
 
diff --git a/Dockerfile b/Dockerfile
index a9277c68b..22835d960 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.3.6 \
+ENV GITLAB_VERSION=11.4.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 618532ec4..269a51551 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.3.6
+# sameersbn/gitlab:11.4.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.3.6
+docker pull sameersbn/gitlab:11.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.3.6
+ sameersbn/gitlab:11.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.3.6
+    sameersbn/gitlab:11.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:sanitize
+    sameersbn/gitlab:11.4.0 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake db:setup
+    sameersbn/gitlab:11.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.3.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.6
+docker pull sameersbn/gitlab:11.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e9d882228..72773deb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.3.6
+11.4.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d1232da6..3f94b9b74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.3.6
+    image: sameersbn/gitlab:11.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c13d54e91..38df49da2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.3.6
+docker pull sameersbn/gitlab:11.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.3.6
+sameersbn/gitlab:11.4.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1de07094f..5e6bec40a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.3.6
+        image: sameersbn/gitlab:11.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 3740f60201e93dae9071f238823afed274bcab44 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:47:25 +0200
Subject: [PATCH 0070/1124] Update baseimage to xenial-20181005

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

diff --git a/Dockerfile b/Dockerfile
index 22835d960..bc0319bc2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20180808
+FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 

From 987c8b8d66c5ec6539ff5b7f63579b93a5370915 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:48:10 +0200
Subject: [PATCH 0071/1124] Update gitlab-workhorse to 7.0.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bc0319bc2..0a32cd76a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=11.4.0 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
-    GITLAB_WORKHORSE_VERSION=6.1.0 \
+    GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.120.1 \
     GITLAB_USER="git" \

From 2704b41d162dc70c9bfcd7c3e7e2f5403bbee054 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:48:31 +0200
Subject: [PATCH 0072/1124] Update gitaly to 0.125.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0a32cd76a..abe9325d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.4.0 \
     GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
-    GITALY_SERVER_VERSION=0.120.1 \
+    GITALY_SERVER_VERSION=0.125.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 1a54c4db6e607c498e29e39b7d1be9eae5607813 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 20:57:16 +0200
Subject: [PATCH 0073/1124] Update Changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 946bd3f6f..5a33727df 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.4.0**
 - gitlab: upgrade CE to v11.4.0
+- baseimage: upgrade to xenial-20181005
 
 **11.3.6**
 - gitlab: upgrade CE to v11.3.6

From 9c17f73c213d0980f63b478b092d7745e444511a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 22:33:47 +0200
Subject: [PATCH 0074/1124] Tag also current version of the image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 851f63bcd..7d65e0657 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
       - run:
           name: Build docker image
           command: |
-            docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} .
+            docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} -t ${IMAGE_NAME}:$(cat VERSION) .
 
       - run:
           name: Launching container for testing

From 719a8a172e471db02bca3a9c9cd15d0057753b01 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 19 Oct 2018 23:35:26 +0200
Subject: [PATCH 0075/1124] release 11.4.0


From 78c8ca1a4da382e6d57df1a0cc85e1f6e8d2f9b2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 19:18:55 +0100
Subject: [PATCH 0076/1124] Upgrade GitLab CE to 11.4.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5a33727df..6ed07caa2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.1**
+- gitlab: upgrade CE to v11.4.1
+
 **11.4.0**
 - gitlab: upgrade CE to v11.4.0
 - baseimage: upgrade to xenial-20181005
diff --git a/Dockerfile b/Dockerfile
index abe9325d1..a03d29d40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.4.0 \
+ENV GITLAB_VERSION=11.4.1 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 269a51551..9dfe6e8c0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.0
+# sameersbn/gitlab:11.4.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -126,7 +126,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.0
+docker pull sameersbn/gitlab:11.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 ## Database
@@ -263,7 +263,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -307,7 +307,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -361,7 +361,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 #### Linking to MySQL Container
@@ -404,7 +404,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -431,7 +431,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 ### Linking to Redis Container
@@ -458,7 +458,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 ### Mail
@@ -471,7 +471,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -568,7 +568,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -584,7 +584,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.0
+ sameersbn/gitlab:11.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -607,7 +607,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -655,7 +655,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.0
+    sameersbn/gitlab:11.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:sanitize
+    sameersbn/gitlab:11.4.1 app:sanitize
 ```
 
 ### Piwik
@@ -1106,7 +1106,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1134,14 +1134,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake db:setup
+    sameersbn/gitlab:11.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1199,7 +1199,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.0
+docker pull sameersbn/gitlab:11.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1296,7 +1296,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 72773deb8..a6e5b12f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.0
+11.4.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f94b9b74..1716e1a11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.0
+    image: sameersbn/gitlab:11.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 38df49da2..c7b7592aa 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.0
+docker pull sameersbn/gitlab:11.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.0
+sameersbn/gitlab:11.4.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5e6bec40a..4ef8d8b11 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.0
+        image: sameersbn/gitlab:11.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 2c9206d1a45a6fa285d6305e3d90cd688e82e308 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 19:39:16 +0100
Subject: [PATCH 0077/1124] Update changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 6ed07caa2..1b59ec8f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.4.1**
 - gitlab: upgrade CE to v11.4.1
+- Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731)
 
 **11.4.0**
 - gitlab: upgrade CE to v11.4.0

From 2ea215be98f225e050382fc0e46d8f44f73a8a57 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 19:39:58 +0100
Subject: [PATCH 0078/1124] release 11.4.1


From 387129f8112de1be646e552aed878cd5623daa29 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 19:45:34 +0100
Subject: [PATCH 0079/1124] Upgrade GitLab CE to 11.4.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1b59ec8f5..4536367c7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.2**
+- gitlab: upgrade CE to v11.4.2
+
 **11.4.1**
 - gitlab: upgrade CE to v11.4.1
 - Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731)
diff --git a/Dockerfile b/Dockerfile
index a03d29d40..a1dbcc516 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.4.1 \
+ENV GITLAB_VERSION=11.4.2 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index c422276d5..d54a43b0e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.1
+# sameersbn/gitlab:11.4.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.1
+docker pull sameersbn/gitlab:11.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.1
+ sameersbn/gitlab:11.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.1
+    sameersbn/gitlab:11.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:sanitize
+    sameersbn/gitlab:11.4.2 app:sanitize
 ```
 
 ### Piwik
@@ -1108,7 +1108,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake db:setup
+    sameersbn/gitlab:11.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1201,7 +1201,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.1
+docker pull sameersbn/gitlab:11.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1298,7 +1298,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a6e5b12f9..3a3e396b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.1
+11.4.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 1716e1a11..10cfbd3f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.1
+    image: sameersbn/gitlab:11.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c7b7592aa..4dafda4a6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.1
+docker pull sameersbn/gitlab:11.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.1
+sameersbn/gitlab:11.4.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4ef8d8b11..047b6a09d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.1
+        image: sameersbn/gitlab:11.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 5a95e81a0d62e767dbf01487c17a93755f38bcd5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 20:08:49 +0100
Subject: [PATCH 0080/1124] release 11.4.2


From b89f464e92304c1a4fdf65f87f3e5d333f6a7be2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 29 Oct 2018 20:10:15 +0100
Subject: [PATCH 0081/1124] Upgrade GitLab CE to 11.4.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4536367c7..10614cbb7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.3**
+- gitlab: upgrade CE to v11.4.3
+
 **11.4.2**
 - gitlab: upgrade CE to v11.4.2
 
diff --git a/Dockerfile b/Dockerfile
index a1dbcc516..66b499a8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.4.2 \
+ENV GITLAB_VERSION=11.4.3 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.3 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index d54a43b0e..73c6ba5ca 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.2
+# sameersbn/gitlab:11.4.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.2
+docker pull sameersbn/gitlab:11.4.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.2
+ sameersbn/gitlab:11.4.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.2
+    sameersbn/gitlab:11.4.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:sanitize
+    sameersbn/gitlab:11.4.3 app:sanitize
 ```
 
 ### Piwik
@@ -1108,7 +1108,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake db:setup
+    sameersbn/gitlab:11.4.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1201,7 +1201,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.2
+docker pull sameersbn/gitlab:11.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1298,7 +1298,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 3a3e396b1..72f04fb9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.2
+11.4.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 10cfbd3f1..df14d95a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.2
+    image: sameersbn/gitlab:11.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4dafda4a6..d967616d1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.2
+docker pull sameersbn/gitlab:11.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.2
+sameersbn/gitlab:11.4.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 047b6a09d..b28575986 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.2
+        image: sameersbn/gitlab:11.4.3
         env:
         - name: TZ
           value: Asia/Kolkata

From b7e527920772484bd802c2b7515f47800c29a969 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 30 Oct 2018 07:24:55 +0100
Subject: [PATCH 0082/1124] release 11.4.3


From 186d6a062ed13e9517d94107b2ec6142a3f237bc Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Thu, 1 Nov 2018 23:14:04 +0100
Subject: [PATCH 0083/1124] upgrade golang to 1.10.4

---
 Changelog.md | 3 +++
 Dockerfile   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 10614cbb7..a40121192 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.4**
+- golang: update to 1.10.4
+
 **11.4.3**
 - gitlab: upgrade CE to v11.4.3
 
diff --git a/Dockerfile b/Dockerfile
index 66b499a8d..322ce0565 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="sameer@damagehead.com"
 
 ENV GITLAB_VERSION=11.4.3 \
     RUBY_VERSION=2.4 \
-    GOLANG_VERSION=1.10.3 \
+    GOLANG_VERSION=1.10.4 \
     GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \

From 8d36cc2a361919162a9ca49b45cc01dbdf37b266 Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Thu, 1 Nov 2018 23:15:44 +0100
Subject: [PATCH 0084/1124] Upgrade GitLab CE to 11.4.4

---
 Changelog.md               |  1 +
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a40121192..29a04d80c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ This file only reflects the changes that are made in this image. Please refer to
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
 **11.4.4**
+- gitlab: upgrade CE to v11.4.4
 - golang: update to 1.10.4
 
 **11.4.3**
diff --git a/Dockerfile b/Dockerfile
index 322ce0565..dcbf35e69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.4.3 \
+ENV GITLAB_VERSION=11.4.4 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 73c6ba5ca..1d5878311 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.3
+# sameersbn/gitlab:11.4.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.3
+docker pull sameersbn/gitlab:11.4.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.3
+ sameersbn/gitlab:11.4.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.3
+    sameersbn/gitlab:11.4.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:sanitize
+    sameersbn/gitlab:11.4.4 app:sanitize
 ```
 
 ### Piwik
@@ -1108,7 +1108,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake db:setup
+    sameersbn/gitlab:11.4.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1201,7 +1201,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.3
+docker pull sameersbn/gitlab:11.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1298,7 +1298,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 72f04fb9d..708f9d541 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.3
+11.4.4
diff --git a/docker-compose.yml b/docker-compose.yml
index df14d95a2..19dd72b7e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.3
+    image: sameersbn/gitlab:11.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d967616d1..570bdd549 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.3
+docker pull sameersbn/gitlab:11.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.3
+sameersbn/gitlab:11.4.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b28575986..b1b167000 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.3
+        image: sameersbn/gitlab:11.4.4
         env:
         - name: TZ
           value: Asia/Kolkata

From cc72dc7bcf32e4da4c8785e1cf546fe1c84a9839 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 2 Nov 2018 11:10:36 +0100
Subject: [PATCH 0085/1124] release 11.4.4


From f018122380e25cd7e3290cd98cedf6f21fa41ba8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 5 Nov 2018 07:44:55 +0100
Subject: [PATCH 0086/1124] Upgrade GitLab CE to 11.4.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 29a04d80c..2390ccc71 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.5**
+- gitlab: upgrade CE to v11.4.5
+
 **11.4.4**
 - gitlab: upgrade CE to v11.4.4
 - golang: update to 1.10.4
diff --git a/Dockerfile b/Dockerfile
index dcbf35e69..ac7ea6e31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 LABEL maintainer="sameer@damagehead.com"
 
-ENV GITLAB_VERSION=11.4.4 \
+ENV GITLAB_VERSION=11.4.5 \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/README.md b/README.md
index 1d5878311..40bf1f040 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.4
+# sameersbn/gitlab:11.4.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.4
+docker pull sameersbn/gitlab:11.4.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.4
+ sameersbn/gitlab:11.4.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.4
+    sameersbn/gitlab:11.4.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:sanitize
+    sameersbn/gitlab:11.4.5 app:sanitize
 ```
 
 ### Piwik
@@ -1108,7 +1108,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake db:setup
+    sameersbn/gitlab:11.4.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1201,7 +1201,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.4
+docker pull sameersbn/gitlab:11.4.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1298,7 +1298,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 708f9d541..64d81d983 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.4
+11.4.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 19dd72b7e..62e1bad53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.4
+    image: sameersbn/gitlab:11.4.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 570bdd549..b385a6cbd 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.4
+docker pull sameersbn/gitlab:11.4.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.4
+sameersbn/gitlab:11.4.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b1b167000..e84389f64 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.4
+        image: sameersbn/gitlab:11.4.5
         env:
         - name: TZ
           value: Asia/Kolkata

From e8b1c729630fa5f78497398bf1ae87f8057c2738 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 5 Nov 2018 14:11:52 +0100
Subject: [PATCH 0087/1124] release 11.4.5


From 7f24c384fb91587479e8eea8311464a930d6db2d Mon Sep 17 00:00:00 2001
From: Maycon Lopes dos Santos <maycon.santos@psafe.com>
Date: Fri, 6 Jul 2018 02:56:22 -0300
Subject: [PATCH 0088/1124] Added GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD
 to the templates

GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD description

fix number of args
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 1 +
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 40bf1f040..255d29dfc 100644
--- a/README.md
+++ b/README.md
@@ -851,6 +851,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 721450af5..48308a096 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -158,6 +158,7 @@ production: &base
     object_store:
       enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
+      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. 
       background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 0330ebd15..29ac89fb8 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -93,6 +93,7 @@ GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
 
 GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts}
+GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index d9f635312..d41d689c1 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -953,6 +953,7 @@ gitlab_configure_artifacts() {
     update_template ${GITLAB_CONFIG} \
       GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \
       GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \
@@ -963,7 +964,7 @@ gitlab_configure_artifacts() {
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
   else 
-   exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
+   exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
   fi
 
   echo "Configuring gitlab::artifacts..."

From 55da4ae7cfbb7ede998aa1036e9af3f1f5fa5809 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 8 Nov 2018 12:14:29 +0100
Subject: [PATCH 0089/1124] Rewrite CI

UPD .gitlab-ci.yml
UPD: Dockerfile
UPD: circle-ci.yml
DEL: ci/gitlab -> moved to .gitlab-ci.yml
ADD: Labels
ADD: Docker Daemon build hook
ADD: Build Arguments
---
 .circleci/config.yml |  7 +++++-
 .gitlab-ci.yml       | 55 +++++++++++++++++++++++++++++++++++++++++---
 CONTRIBUTING.md      | 12 ++++++++++
 Dockerfile           | 17 ++++++++++++--
 ci/gitlab            | 15 ------------
 hooks/build          | 10 ++++++++
 6 files changed, 95 insertions(+), 21 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100755 ci/gitlab
 create mode 100644 hooks/build

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d65e0657..b58ff2ab1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,12 @@ jobs:
       - run:
           name: Build docker image
           command: |
-            docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} -t ${IMAGE_NAME}:$(cat VERSION) .
+            docker build \
+              --cache-from=${IMAGE_NAME} \
+              --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+              --build-arg VCS_REF=`git rev-parse --short HEAD` \
+              --build-arg VERSION=$(cat VERSION) \
+              -t ${IMAGE_NAME}:$(cat VERSION) .
 
       - run:
           name: Launching container for testing
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07ba61dbf..c712978ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,54 @@
-image: docker:dind
+image: docker:18-git
 
-deploy:
+stages:
+  - build
+
+before_script:
+  - export VERSION=$(cat VERSION)
+  - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com}
+  - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token}
+  - export CI_REGISTRY_PASS=${CI_REGISTRY_PASS:-${CI_JOB_TOKEN}}
+  - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}}
+  - |
+    if [ "${DOCKER_IMAGE}" = "/" ]; then
+      export DOCKER_IMAGE=sameersbn/gitlab
+    fi
+
+docker:build:
+  stage: build
+  only:
+    - master
+  script:
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker build
+      --build-arg VCS_REF=`git rev-parse --short HEAD`
+      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
+      --build-arg VERSION=${VERSION}
+      --tag ${DOCKER_IMAGE} .
+    - docker push ${DOCKER_IMAGE}
+
+docker:build:branches:
+  stage: build
+  only:
+    - branches
+  script:
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker build
+      --build-arg VCS_REF=`git rev-parse --short HEAD`
+      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
+      --build-arg VERSION=${VERSION}
+      --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} .
+    - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-}
+
+docker:build:release:
+  stage: build
+  only:
+    - tags
   script:
-    - ci/gitlab
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker build
+      --build-arg VCS_REF=`git rev-parse --short HEAD`
+      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
+      --build-arg VERSION=${VERSION}
+      --tag ${DOCKER_IMAGE}:${VERSION} .
+    - docker push ${DOCKER_IMAGE}:${VERSION}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..4d495a502
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Gitlab-CI Configuration
+
+When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the Gitlab Instance. If needed several options can be overriden.
+
+Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
+
+| Variable           | Default Value      | Description                                                                                                                                                                                                             |
+| ------------------ | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the Gitlab instance                                                                                                    |
+| `CI_REGISTRY_USER` | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                               |
+| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                               |
+| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlan instance with the `${C_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. |
diff --git a/Dockerfile b/Dockerfile
index ac7ea6e31..f0fcfbc20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,21 @@
 FROM ubuntu:xenial-20181005
 
-LABEL maintainer="sameer@damagehead.com"
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
 
-ENV GITLAB_VERSION=11.4.5 \
+LABEL \
+    maintainer="sameer@damagehead.com" \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.name=gitlab \
+    org.label-schema.vendor=damagehead \
+    org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \
+    org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    com.damagehead.gitlab.license=MIT
+
+ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
     GITLAB_SHELL_VERSION=8.3.3 \
diff --git a/ci/gitlab b/ci/gitlab
deleted file mode 100755
index 1b8736d56..000000000
--- a/ci/gitlab
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-VERSION=$(cat VERSION)
-DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST:-hub.docker.com}
-DOCKER_IMAGE=${DOCKER_IMAGE:-sameersbn/gitlab}
-
-docker build -t $DOCKER_IMAGE .
-
-docker tag $DOCKER_IMAGE $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:latest
-docker tag $DOCKER_IMAGE $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:$VERSION
-
-docker push $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:latest
-docker push $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:$VERSION
diff --git a/hooks/build b/hooks/build
new file mode 100644
index 000000000..8e7321320
--- /dev/null
+++ b/hooks/build
@@ -0,0 +1,10 @@
+!/bin/bash
+
+# Docker Daemon Build Hook
+# $IMAGE_NAME var is injected into the build so the tag is correct.
+
+docker build \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VERSION=$(cat VERSION) \
+		-t $IMAGE_NAME .

From 06ecea88552d7abb755dafd0da987ab8672b2f6b Mon Sep 17 00:00:00 2001
From: Lewis Marshall <lewis.marshall@digital.homeoffice.gov.uk>
Date: Wed, 7 Nov 2018 09:08:15 +0000
Subject: [PATCH 0090/1124] Make the chown of backup files optional

---
 README.md                   | 1 +
 assets/runtime/env-defaults | 2 +-
 assets/runtime/functions    | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 255d29dfc..dfd0182ac 100644
--- a/README.md
+++ b/README.md
@@ -844,6 +844,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |
 | `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` |
 | `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` |
+| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up | Defaults to `true` |
 | `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` |
 | `GITLAB_DOWNLOADS_DIR` | The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`. |
 | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 29ac89fb8..d2a4295b7 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -5,6 +5,7 @@ DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT}
 ## GITLAB CORE
 GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp"
 GITLAB_BACKUP_DIR="${GITLAB_BACKUP_DIR:-$GITLAB_DATA_DIR/backups}"
+GITLAB_BACKUP_DIR_CHOWN=${GITLAB_BACKUP_DIR_CHOWN:-true}
 GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}"
 GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}"
 GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
@@ -425,4 +426,3 @@ GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807}
-
diff --git a/assets/runtime/functions b/assets/runtime/functions
index d41d689c1..848b444cf 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1329,7 +1329,9 @@ initialize_datadir() {
 
   # create the backups directory
   mkdir -p ${GITLAB_BACKUP_DIR}
-  chown ${GITLAB_USER}: ${GITLAB_BACKUP_DIR}
+  if [[ ${GITLAB_BACKUP_DIR_CHOWN} == true ]]; then
+    chown ${GITLAB_USER}: ${GITLAB_BACKUP_DIR}
+  fi
 
   # create the uploads directory
   mkdir -p ${GITLAB_DATA_DIR}/uploads

From b545d7397af23c72814d5ab57aa231f188aecc54 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Fri, 9 Nov 2018 08:47:01 +0100
Subject: [PATCH 0091/1124] Review Update

* Fix: backticks
* Fix: date format (change to RFC 3339 format)
* Fix: default version
* Fix: typo
* Fix timeout during launching test fase
* Add: --cache-from

***Note: --rfc-3389=s as argument for `date` not used. This is not available within alpine (BusyBox)***
---
 .circleci/config.yml | 10 +++++-----
 .gitlab-ci.yml       | 28 +++++++++++++++++-----------
 CONTRIBUTING.md      | 12 ++++++------
 Dockerfile           |  2 +-
 hooks/build          | 10 ++++++----
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b58ff2ab1..7b7208972 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,6 @@ jobs:
             docker version
             docker info
 
-
       - restore_cache:
           keys:
             - cache-{{ .Branch }}
@@ -40,9 +39,10 @@ jobs:
           name: Build docker image
           command: |
             docker build \
+              --pull \
               --cache-from=${IMAGE_NAME} \
-              --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-              --build-arg VCS_REF=`git rev-parse --short HEAD` \
+              --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
+              --build-arg VCS_REF=$(git rev-parse --short HEAD) \
               --build-arg VERSION=$(cat VERSION) \
               -t ${IMAGE_NAME}:$(cat VERSION) .
 
@@ -50,13 +50,13 @@ jobs:
           name: Launching container for testing
           command: |
             docker-compose up -d
-            sleep 10
+            sleep 120
 
       - run:
           name: Testing image
           command: |
             docker run --network container:$(docker-compose ps -q gitlab) \
-              appropriate/curl --retry 12 --retry-delay 5 --retry-connrefused http://localhost/explore
+              appropriate/curl --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
 
       - run:
           name: Generate docker build image cache
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c712978ba..8f1c35ff9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,9 +21,11 @@ docker:build:
   script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
     - docker build
-      --build-arg VCS_REF=`git rev-parse --short HEAD`
-      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
-      --build-arg VERSION=${VERSION}
+      --pull
+      --cache-from=${DOCKER_IMAGE}
+      --build-arg=VCS_REF=$(git rev-parse --short HEAD)
+      --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
+      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE} .
     - docker push ${DOCKER_IMAGE}
 
@@ -34,11 +36,13 @@ docker:build:branches:
   script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
     - docker build
-      --build-arg VCS_REF=`git rev-parse --short HEAD`
-      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
-      --build-arg VERSION=${VERSION}
-      --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} .
-    - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-}
+      --pull
+      --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
+      --build-arg=VCS_REF=$(git rev-parse --short HEAD)
+      --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
+      --build-arg=VERSION=${VERSION}
+      --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} .
+    - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
 
 docker:build:release:
   stage: build
@@ -47,8 +51,10 @@ docker:build:release:
   script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
     - docker build
-      --build-arg VCS_REF=`git rev-parse --short HEAD`
-      --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
-      --build-arg VERSION=${VERSION}
+      --pull
+      --cache-from=${DOCKER_IMAGE}:${VERSION}
+      --build-arg=VCS_REF=$(git rev-parse --short HEAD)
+      --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
+      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE}:${VERSION} .
     - docker push ${DOCKER_IMAGE}:${VERSION}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4d495a502..bd8fd424e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,9 +4,9 @@ When using your own gitlab instance, the provided .gitlab-ci.yml will be automat
 
 Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
 
-| Variable           | Default Value      | Description                                                                                                                                                                                                             |
-| ------------------ | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the Gitlab instance                                                                                                    |
-| `CI_REGISTRY_USER` | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                               |
-| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                               |
-| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlan instance with the `${C_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. |
+| Variable           | Default Value      | Description                                                                                                                                                                                                              |
+| ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the Gitlab instance                                                                                                     |
+| `CI_REGISTRY_USER` | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
+| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
+| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. |
diff --git a/Dockerfile b/Dockerfile
index f0fcfbc20..ba3d24e54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION
+ARG VERSION=11.4.5
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/hooks/build b/hooks/build
index 8e7321320..e0e2f7bc3 100644
--- a/hooks/build
+++ b/hooks/build
@@ -4,7 +4,9 @@
 # $IMAGE_NAME var is injected into the build so the tag is correct.
 
 docker build \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VERSION=$(cat VERSION) \
-		-t $IMAGE_NAME .
+		--pull \
+		--cache-from=${IMAGE_NAME} \
+		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg=VCS_REF=$(git rev-parse --short HEAD) \
+		--build-arg=VERSION=$(cat VERSION) \
+		-t ${IMAGE_NAME} .

From 5173f8861241986e7a61365d99d8cc7557ed0078 Mon Sep 17 00:00:00 2001
From: Waldemar Reusch <lordvlad@users.noreply.github.com>
Date: Sun, 18 Nov 2018 17:17:16 +0100
Subject: [PATCH 0092/1124] fix bootloop for rare race condition between kill
 and wait

`wait` will throw an error if a process it waits for is terminated by an external signal. Together with `set -e` this will stop the whole entrypoint script. I guess this issues only crops up very rarely, as the `kill` command already waits for the supervisor process to shut down, and the test using `ps h -p $SUPERVISOR_PID` returns false and thus `wait` is never called.

You can check the behavior using following simple script:

```bash
#!/bin/bash
#set -e
echo "Testing wait command"
sleep 20 &
pid=$!
kill $pid
wait $pid
echo $pid was terminated.
```
as long as `set -e` is commented out, `$pid was terminated` will print. If you enable `set -e`, the last line will not be printed, as the script fails in the `wait` command.
---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 3d810ef43..7773ae70e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -19,7 +19,7 @@ case ${1} in
         SUPERVISOR_PID=$!
         migrate_database
         kill -15 $SUPERVISOR_PID
-        ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID
+        ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID || true
         rm -rf /var/run/supervisor.sock
         exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
         ;;

From 09a7a1c12d4f6f16afcd7761b9fa102ddce89b48 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 19 Nov 2018 07:42:52 +0100
Subject: [PATCH 0093/1124] Invalidate cache for all builds

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7b7208972..8745a2a47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ jobs:
 
       - restore_cache:
           keys:
-            - cache-{{ .Branch }}
+            - cache-v2-{{ .Branch }}
           paths:
             - /tmp/cache/layers.tar
 
@@ -65,7 +65,7 @@ jobs:
             docker save -o /tmp/cache/layers.tar ${IMAGE_NAME}
 
       - save_cache:
-          key: cache-{{ .Branch }}-{{ epoch }}
+          key: cache-v2-{{ .Branch }}
           paths:
             - /tmp/cache/layers.tar
 

From 618d88b16a83656b3530152f8fda6928e7633c66 Mon Sep 17 00:00:00 2001
From: reusch <waldemar.reusch@insilico-biotechnology.com>
Date: Mon, 19 Nov 2018 17:35:08 +0100
Subject: [PATCH 0094/1124] which -s flag is not universal

---
 kubernetes/deploy.sh   | 2 +-
 kubernetes/teardown.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh
index f899ff418..2e4982d24 100755
--- a/kubernetes/deploy.sh
+++ b/kubernetes/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ! which -s kubectl; then
+if ! which kubectl > /dev/null; then
   echo "kubectl command not installed"
   exit 1
 fi
diff --git a/kubernetes/teardown.sh b/kubernetes/teardown.sh
index 3937c4bc7..3ee820fb3 100755
--- a/kubernetes/teardown.sh
+++ b/kubernetes/teardown.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if ! which -s kubectl; then
+if ! which kubectl > /dev/null; then
   echo "kubectl command not installed"
   exit 1
 fi

From 86f49942733315e979d2bd0f9e6658855e0a62e0 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Tue, 20 Nov 2018 16:51:28 +0100
Subject: [PATCH 0095/1124] fix double CI job

Exclude master branch from docker:build:branches
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f1c35ff9..6e8d57ad2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,8 @@ docker:build:branches:
   stage: build
   only:
     - branches
+  except:
+    - master
   script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
     - docker build

From c872e80f5f61abc7657d78bc92c41768a6b1a150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Wed, 21 Nov 2018 20:58:40 +0100
Subject: [PATCH 0096/1124] Upgrade GitLab to 11.4.6

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2390ccc71..36d0ad213 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.6**
+- gitlab: upgrade CE to v11.4.6
+
 **11.4.5**
 - gitlab: upgrade CE to v11.4.5
 
diff --git a/Dockerfile b/Dockerfile
index ba3d24e54..e069f615b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.4.5
+ARG VERSION=11.4.6
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/README.md b/README.md
index dfd0182ac..7c40065fd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.5
+# sameersbn/gitlab:11.4.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.5
+docker pull sameersbn/gitlab:11.4.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.5
+ sameersbn/gitlab:11.4.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.5
+    sameersbn/gitlab:11.4.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:sanitize
+    sameersbn/gitlab:11.4.6 app:sanitize
 ```
 
 ### Piwik
@@ -1110,7 +1110,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1138,14 +1138,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake db:setup
+    sameersbn/gitlab:11.4.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1203,7 +1203,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.5
+docker pull sameersbn/gitlab:11.4.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1300,7 +1300,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 64d81d983..9bde90d2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.5
+11.4.6
diff --git a/docker-compose.yml b/docker-compose.yml
index 62e1bad53..59f2b727a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.5
+    image: sameersbn/gitlab:11.4.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b385a6cbd..00eb18883 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.5
+docker pull sameersbn/gitlab:11.4.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.5
+sameersbn/gitlab:11.4.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e84389f64..1ed483643 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.5
+        image: sameersbn/gitlab:11.4.6
         env:
         - name: TZ
           value: Asia/Kolkata

From f7f6e0408411cff65f7ffe9c7d53769465267d92 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Nov 2018 20:38:36 +0100
Subject: [PATCH 0097/1124] release 11.4.6


From 7b3e7cbbf76530841b4bbcdd682dcd5abc4baae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Wed, 21 Nov 2018 21:01:19 +0100
Subject: [PATCH 0098/1124] Upgrade GitLab to 11.4.7

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 36d0ad213..f747ae2e1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.4.7**
+- gitlab: upgrade CE to v11.4.7
+
 **11.4.6**
 - gitlab: upgrade CE to v11.4.6
 
diff --git a/Dockerfile b/Dockerfile
index e069f615b..e8b881881 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.4.6
+ARG VERSION=11.4.7
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/README.md b/README.md
index 7c40065fd..bf7cdbcd6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.6
+# sameersbn/gitlab:11.4.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.6
+docker pull sameersbn/gitlab:11.4.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.6
+ sameersbn/gitlab:11.4.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.6
+    sameersbn/gitlab:11.4.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:sanitize
+    sameersbn/gitlab:11.4.7 app:sanitize
 ```
 
 ### Piwik
@@ -1110,7 +1110,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1138,14 +1138,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake db:setup
+    sameersbn/gitlab:11.4.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1203,7 +1203,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:env:info
+    sameersbn/gitlab:11.4.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.4.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.6
+docker pull sameersbn/gitlab:11.4.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1300,7 +1300,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.7
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9bde90d2f..30fb042e4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.6
+11.4.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 59f2b727a..6eb996407 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.6
+    image: sameersbn/gitlab:11.4.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 00eb18883..4c7f0f2a4 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.6
+docker pull sameersbn/gitlab:11.4.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.6
+sameersbn/gitlab:11.4.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1ed483643..bec307f1b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.6
+        image: sameersbn/gitlab:11.4.7
         env:
         - name: TZ
           value: Asia/Kolkata

From d51ba2d5f1d0bf5e0066d6ac08b5657ca4c50e5e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Nov 2018 20:42:08 +0100
Subject: [PATCH 0099/1124] release 11.4.7


From 0ad289d1c3b516a675ce367b88326f8dd5d3d2bc Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Fri, 23 Nov 2018 11:01:58 +0100
Subject: [PATCH 0100/1124] Fix docker-hook

---
 hooks/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/build b/hooks/build
index e0e2f7bc3..0372272d4 100644
--- a/hooks/build
+++ b/hooks/build
@@ -1,4 +1,4 @@
-!/bin/bash
+#!/bin/bash
 
 # Docker Daemon Build Hook
 # $IMAGE_NAME var is injected into the build so the tag is correct.

From ba10cbd9623857db4d1fa84af8cd45f15d553b00 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 23 Nov 2018 21:27:44 +0100
Subject: [PATCH 0101/1124] Add shellcheck to CI

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8745a2a47..6b81234e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,21 @@
 version: 2
 jobs:
+  shellcheck:
+    docker:
+      - image: nlknguyen/alpine-shellcheck:v0.4.6
+    steps:
+      - checkout
+      - run:
+          name: Check Docker Hub Hooks
+          command: |
+            find hooks -type f | wc -l
+            find hooks -type f | xargs shellcheck -e SC2086 --external-sources
+      - run:
+          name: Check Scripts
+          command: |
+            find . -type f -name '*.sh' | wc -l
+            find . -type f -name '*.sh' | xargs shellcheck -e SC2086 -e SC1090 --external-sources
+
   build:
     docker:
       - image: circleci/golang:1-stretch-browsers-legacy
@@ -73,4 +89,5 @@ workflows:
   version: 2
   build-and-test:
     jobs:
+      - shellcheck
       - build

From 9d5f0dbb0bad75fc4e9e8ccd14c61a35aae71db6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 23 Nov 2018 21:28:10 +0100
Subject: [PATCH 0102/1124] Fix various shellcheck warnings and errors

Signed-off-by: solidnerd <niclas@mietz.io>
---
 assets/build/install.sh | 14 +++++++-------
 entrypoint.sh           | 10 +++++++---
 hooks/build             |  4 ++--
 kubernetes/deploy.sh    |  4 +++-
 kubernetes/teardown.sh  |  4 +++-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 2216a6982..bd0e11247 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -27,8 +27,8 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
 
 ## Execute a command as GITLAB_USER
 exec_as_git() {
-  if [[ $(whoami) == ${GITLAB_USER} ]]; then
-    $@
+  if [[ $(whoami) == "${GITLAB_USER}" ]]; then
+    "$@"
   else
     sudo -HEu ${GITLAB_USER} "$@"
   fi
@@ -42,9 +42,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL
 # Applying the mark late here does make the build usable on PaX kernels, but
 # still the build itself must be executed on a non-PaX kernel. It's done here
 # only for simplicity.
-paxctl -Cm `which ruby${RUBY_VERSION}`
+paxctl -Cm "$(command -v ruby${RUBY_VERSION})"
 # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
-paxctl -Cm `which nodejs`
+paxctl -Cm "$(command -v nodejs)"
 
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
@@ -134,8 +134,8 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR}
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
 # Fix for rebase in forks 
-echo "Linking $(which gitaly-ssh) to /"
-ln -s $(which gitaly-ssh) /
+echo "Linking $(command -v gitaly-ssh) to /"
+ln -s "$(command -v gitaly-ssh)" /
 
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb
@@ -151,7 +151,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
   chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache
 fi
 
-exec_as_git bundle install -j$(nproc) --deployment --without development test aws
+exec_as_git bundle install -j"$(nproc)" --deployment --without development test aws
 
 # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user
 chown -R ${GITLAB_USER}: ${GITLAB_HOME}
diff --git a/entrypoint.sh b/entrypoint.sh
index 7773ae70e..dee9f20e7 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
-source ${GITLAB_RUNTIME_DIR}/functions
+set -o pipefail
+
+source "${GITLAB_RUNTIME_DIR}/functions"
 
 [[ $DEBUG == true ]] && set -x
 
@@ -19,7 +21,9 @@ case ${1} in
         SUPERVISOR_PID=$!
         migrate_database
         kill -15 $SUPERVISOR_PID
-        ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID || true
+        if ps h -p $SUPERVISOR_PID > /dev/null ; then
+        wait $SUPERVISOR_PID || true
+        fi
         rm -rf /var/run/supervisor.sock
         exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
         ;;
@@ -31,7 +35,7 @@ case ${1} in
         ;;
       app:rake)
         shift 1
-        execute_raketask $@
+        execute_raketask "$@"
         ;;
     esac
     ;;
diff --git a/hooks/build b/hooks/build
index 0372272d4..ca490f828 100644
--- a/hooks/build
+++ b/hooks/build
@@ -7,6 +7,6 @@ docker build \
 		--pull \
 		--cache-from=${IMAGE_NAME} \
 		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
-		--build-arg=VCS_REF=$(git rev-parse --short HEAD) \
-		--build-arg=VERSION=$(cat VERSION) \
+		--build-arg=VCS_REF="$(git rev-parse --short HEAD)" \
+		--build-arg=VERSION="$(cat VERSION)" \
 		-t ${IMAGE_NAME} .
diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh
index 2e4982d24..315c6b168 100755
--- a/kubernetes/deploy.sh
+++ b/kubernetes/deploy.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+set -e 
+set -o pipefail
 
-if ! which kubectl > /dev/null; then
+if ! command -v kubectl > /dev/null; then
   echo "kubectl command not installed"
   exit 1
 fi
diff --git a/kubernetes/teardown.sh b/kubernetes/teardown.sh
index 3ee820fb3..c4b3be9e8 100755
--- a/kubernetes/teardown.sh
+++ b/kubernetes/teardown.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+set -e 
+set -o pipefail
 
-if ! which kubectl > /dev/null; then
+if ! command -v kubectl > /dev/null; then
   echo "kubectl command not installed"
   exit 1
 fi

From f13072d29279af35f90536a7599ef1d5fe58f2e4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Nov 2018 20:55:56 +0100
Subject: [PATCH 0103/1124] Upgrade GitLab CE to 11.5.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f747ae2e1..39d31101c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.0**
+- gitlab: upgrade CE to v11.5.0
+
 **11.4.7**
 - gitlab: upgrade CE to v11.4.7
 
diff --git a/Dockerfile b/Dockerfile
index e8b881881..8dccc287b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.4.7
+ARG VERSION=11.5.0
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/README.md b/README.md
index bf7cdbcd6..7e035f1a0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.4.7
+# sameersbn/gitlab:11.5.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.4.7
+docker pull sameersbn/gitlab:11.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.4.7
+ sameersbn/gitlab:11.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.4.7
+    sameersbn/gitlab:11.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:sanitize
+    sameersbn/gitlab:11.5.0 app:sanitize
 ```
 
 ### Piwik
@@ -1110,7 +1110,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1138,14 +1138,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake db:setup
+    sameersbn/gitlab:11.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1203,7 +1203,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.4.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.7
+docker pull sameersbn/gitlab:11.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1300,7 +1300,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 30fb042e4..7ef698131 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.4.7
+11.5.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 6eb996407..89eacb1c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.4.7
+    image: sameersbn/gitlab:11.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4c7f0f2a4..f43249498 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.4.7
+docker pull sameersbn/gitlab:11.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.4.7
+sameersbn/gitlab:11.5.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bec307f1b..39d65dea8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.4.7
+        image: sameersbn/gitlab:11.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From a2da8fe2219354a2cd0e6c2708d89806a8c23fb4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:47:33 +0100
Subject: [PATCH 0104/1124] Update gitlab-shell to 8.4.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8dccc287b..6695669b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
-    GITLAB_SHELL_VERSION=8.3.3 \
     GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.125.1 \
+    GITLAB_SHELL_VERSION=8.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 2bd920a7a7873ae09fa1d0621e2c7bac1a474b1c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:47:51 +0100
Subject: [PATCH 0105/1124] Update gitlab-workhorse to 7.1.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6695669b1..77340f6e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
-    GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.125.1 \
     GITLAB_SHELL_VERSION=8.4.1 \
+    GITLAB_WORKHORSE_VERSION=7.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From b369fc3bed10ef564ab9663f1a2241db7aa435cd Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:48:09 +0100
Subject: [PATCH 0106/1124] Update gitlab-pages to 1.3.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 77340f6e2..6e767f6c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
-    GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.125.1 \
     GITLAB_SHELL_VERSION=8.4.1 \
     GITLAB_WORKHORSE_VERSION=7.1.0 \
+    GITLAB_PAGES_VERSION=1.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From eeb13341cfdce13ea7dcfc8ecb20d942ed698084 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:48:38 +0100
Subject: [PATCH 0107/1124] Update gitaly to 0.129.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6e767f6c2..7338c8b86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
-    GITALY_SERVER_VERSION=0.125.1 \
     GITLAB_SHELL_VERSION=8.4.1 \
     GITLAB_WORKHORSE_VERSION=7.1.0 \
     GITLAB_PAGES_VERSION=1.3.0 \
+    GITALY_SERVER_VERSION=0.129.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From e2de4be09b5d2101e39c2ece621992a8b8cf653d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:53:58 +0100
Subject: [PATCH 0108/1124] Update base image to 20181113

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7338c8b86..aa2d14649 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20181005
+FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
+    GITLAB_WORKHORSE_VERSION=7.0.0 \
+    GITLAB_PAGES_VERSION=1.1.0 \
+    GITALY_SERVER_VERSION=0.125.1 \
     GITLAB_SHELL_VERSION=8.4.1 \
-    GITLAB_WORKHORSE_VERSION=7.1.0 \
-    GITLAB_PAGES_VERSION=1.3.0 \
-    GITALY_SERVER_VERSION=0.129.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 029807a2bef0c7b7519f0bcf86b953d487ce0aab Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:56:00 +0100
Subject: [PATCH 0109/1124] Update to ruby 2.5

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index aa2d14649..bcee20f30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,8 @@ LABEL \
     com.damagehead.gitlab.license=MIT
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.4 \
     GOLANG_VERSION=1.10.4 \
+    RUBY_VERSION=2.5 \
     GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.125.1 \

From 3bb8c0702d7683aa2088fc2da2d93508402e2e4d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 12:56:15 +0100
Subject: [PATCH 0110/1124] Update golang to 1.10.5

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bcee20f30..71ad4cb40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,8 @@ LABEL \
     com.damagehead.gitlab.license=MIT
 
 ENV GITLAB_VERSION=${VERSION} \
-    GOLANG_VERSION=1.10.4 \
     RUBY_VERSION=2.5 \
+    GOLANG_VERSION=1.10.5 \
     GITLAB_WORKHORSE_VERSION=7.0.0 \
     GITLAB_PAGES_VERSION=1.1.0 \
     GITALY_SERVER_VERSION=0.125.1 \

From 0a8f6bd872e88e2d536a6b5effc98343cf994bf5 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Mon, 12 Nov 2018 19:24:29 +0100
Subject: [PATCH 0111/1124] Add: gitlab pages access control (11.5)

Added gitlab pages access control (Introduced in gitlab 11.5).

Fixes: #1769
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7e035f1a0..7c2beefd3 100644
--- a/README.md
+++ b/README.md
@@ -916,6 +916,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. |
 | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default |
+| `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. |
 | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. |
 | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` |
 | `GITALY_TOKEN` | Set a gitaly token, blank by default. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 48308a096..1c09c2c18 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -226,10 +226,10 @@ production: &base
     port: {{GITLAB_PAGES_PORT}} # Set to 443 if you serve the pages with HTTPS
     https: {{GITLAB_PAGES_HTTPS}} # Set to true if you serve the pages with HTTPS
     artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}}
+    access_control: {{GITLAB_PAGES_ACCESS_CONTROL}} # If true, allows access to a Pages site to be controlled based on a user’s membership to that project
     external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages
     external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages
 
-
   ## Mattermost
   ## For enabling Add to Mattermost button
   mattermost:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index d2a4295b7..96a537f96 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -413,6 +413,7 @@ GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true}
 GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false}
 GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
 GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
+GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false}
 
 ## Gitaly
 GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 848b444cf..ce851b98f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1073,7 +1073,8 @@ gitlab_configure_pages(){
     GITLAB_PAGES_DOMAIN \
     GITLAB_PAGES_PORT \
     GITLAB_PAGES_HTTPS \
-    GITLAB_PAGES_ARTIFACTS_SERVER
+    GITLAB_PAGES_ARTIFACTS_SERVER \
+    GITLAB_PAGES_ACCESS_CONTROL
 
   if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then
     update_template ${GITLAB_CONFIG} \

From 19793c68e3c26b03a723c9ed08c6a378eeb3e636 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 25 Nov 2018 17:11:34 +0100
Subject: [PATCH 0112/1124] release 11.5.0


From 19ec07f6000a3eb69df5b99bd18a2d0e14a6d2e2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 28 Nov 2018 19:39:50 +0100
Subject: [PATCH 0113/1124] Upgrade GitLab CE to 11.5.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 39d31101c..ee6c6298a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.1**
+- gitlab: upgrade CE to v11.5.1
+
 **11.5.0**
 - gitlab: upgrade CE to v11.5.0
 
diff --git a/Dockerfile b/Dockerfile
index 71ad4cb40..9c3184234 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.0
+ARG VERSION=11.5.1
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/README.md b/README.md
index 7c2beefd3..768a382bf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.0
+# sameersbn/gitlab:11.5.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.0
+docker pull sameersbn/gitlab:11.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.0
+ sameersbn/gitlab:11.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.0
+    sameersbn/gitlab:11.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:sanitize
+    sameersbn/gitlab:11.5.1 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake db:setup
+    sameersbn/gitlab:11.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.0
+docker pull sameersbn/gitlab:11.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 7ef698131..326ba189b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.0
+11.5.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 89eacb1c7..3a917224e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.0
+    image: sameersbn/gitlab:11.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f43249498..f04271634 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.0
+docker pull sameersbn/gitlab:11.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.0
+sameersbn/gitlab:11.5.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 39d65dea8..826e11e0f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.0
+        image: sameersbn/gitlab:11.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From d3323605e6a2521e26cea1780bb3f22161615c51 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 28 Nov 2018 20:47:44 +0100
Subject: [PATCH 0114/1124] release 11.5.1


From e60d5549bad17066bb48175745e870b6b8d94301 Mon Sep 17 00:00:00 2001
From: Dave Conroy <23528985+tiredofit@users.noreply.github.com>
Date: Thu, 29 Nov 2018 11:36:16 -0800
Subject: [PATCH 0115/1124] Provide correct versions for dependencies

Update Gitlab Shell to 8.4.1
Update Gitlab Workhorse to 7.1.3
Update Gitlab Pages to 1.3.1
Update Gitaly Server to 0.129.0
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c3184234..545e21dd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.10.5 \
-    GITLAB_WORKHORSE_VERSION=7.0.0 \
-    GITLAB_PAGES_VERSION=1.1.0 \
-    GITALY_SERVER_VERSION=0.125.1 \
-    GITLAB_SHELL_VERSION=8.4.1 \
+    GITLAB_SHELL_VERSION="8.4.1" \
+    GITLAB_WORKHORSE_VERSION="7.1.3" \
+    GITLAB_PAGES_VERSION="1.3.1" \
+    GITALY_SERVER_VERSION="0.129.0"
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From b584ba3472868cc00b782bd169df29ee0c165bae Mon Sep 17 00:00:00 2001
From: Dave Conroy <23528985+tiredofit@users.noreply.github.com>
Date: Thu, 29 Nov 2018 22:11:16 -0800
Subject: [PATCH 0116/1124] Update Dockerfile

Update Versions
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 545e21dd0..c6d5b0753 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION="8.4.1" \
     GITLAB_WORKHORSE_VERSION="7.1.3" \
     GITLAB_PAGES_VERSION="1.3.1" \
-    GITALY_SERVER_VERSION="0.129.0"
+    GITALY_SERVER_VERSION="0.129.0" \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 4ac1096cc7dd37fba77d3653595fba0fd42b27dc Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Fri, 30 Nov 2018 17:44:15 +0100
Subject: [PATCH 0117/1124] Fix spelling of GitLab

---
 CONTRIBUTING.md | 8 ++++----
 README.md       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd8fd424e..f6f3fc40e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
-# Gitlab-CI Configuration
+# GitLab-CI Configuration
 
-When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the Gitlab Instance. If needed several options can be overriden.
+When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the GitLab Instance. If needed several options can be overriden.
 
 Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
 
 | Variable           | Default Value      | Description                                                                                                                                                                                                              |
 | ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the Gitlab instance                                                                                                     |
+| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
 | `CI_REGISTRY_USER` | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
 | `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
-| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. |
+| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |
diff --git a/README.md b/README.md
index 768a382bf..aa2ab1c26 100644
--- a/README.md
+++ b/README.md
@@ -862,7 +862,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
-| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
+| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
 | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
 | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
 | `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` |

From 354bf1e58fb8b7ab01f640a794f7bd7681b712d9 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 3 Dec 2018 08:50:41 +0100
Subject: [PATCH 0118/1124] Update docs and files for 11.5.1-1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 ++
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 6 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ee6c6298a..75fc0cec5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.1-1**
+- Fixed GitLab Dependencies
+
 **11.5.1**
 - gitlab: upgrade CE to v11.5.1
 
diff --git a/README.md b/README.md
index aa2ab1c26..629a6ebe9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.1
+# sameersbn/gitlab:11.5.1-1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1
+docker pull sameersbn/gitlab:11.5.1-1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.1
+ sameersbn/gitlab:11.5.1-1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.1
+    sameersbn/gitlab:11.5.1-1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:sanitize
+    sameersbn/gitlab:11.5.1-1 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake db:setup
+    sameersbn/gitlab:11.5.1-1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.1-1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1
+docker pull sameersbn/gitlab:11.5.1-1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1-1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 326ba189b..4d3032cbc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.1
+11.5.1-1
diff --git a/docker-compose.yml b/docker-compose.yml
index 3a917224e..94506109b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.1
+    image: sameersbn/gitlab:11.5.1-1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f04271634..f8061cf75 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1
+docker pull sameersbn/gitlab:11.5.1-1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.1
+sameersbn/gitlab:11.5.1-1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 826e11e0f..221bc5ea2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.1
+        image: sameersbn/gitlab:11.5.1-1
         env:
         - name: TZ
           value: Asia/Kolkata

From 191d18984469e4485ebc28aae0de3fe0bc1240b3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 3 Dec 2018 12:21:21 +0100
Subject: [PATCH 0119/1124] Remove version build-arg use default of dockerfile
 instead

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .circleci/config.yml | 1 -
 .gitlab-ci.yml       | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b81234e1..d9ff09bd9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,6 @@ jobs:
               --cache-from=${IMAGE_NAME} \
               --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
               --build-arg VCS_REF=$(git rev-parse --short HEAD) \
-              --build-arg VERSION=$(cat VERSION) \
               -t ${IMAGE_NAME}:$(cat VERSION) .
 
       - run:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e8d57ad2..675b0495c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ docker:build:
       --cache-from=${DOCKER_IMAGE}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE} .
     - docker push ${DOCKER_IMAGE}
 
@@ -42,7 +41,6 @@ docker:build:branches:
       --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} .
     - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
 
@@ -57,6 +55,5 @@ docker:build:release:
       --cache-from=${DOCKER_IMAGE}:${VERSION}
       --build-arg=VCS_REF=$(git rev-parse --short HEAD)
       --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"
-      --build-arg=VERSION=${VERSION}
       --tag ${DOCKER_IMAGE}:${VERSION} .
     - docker push ${DOCKER_IMAGE}:${VERSION}

From a2f79dab432670ff4fd928f75541ec3636db040b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 02:47:28 -0800
Subject: [PATCH 0120/1124] Update hook to build a little bit faster

Signed-off-by: solidnerd <niclas@mietz.io>
---
 hooks/build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hooks/build b/hooks/build
index ca490f828..7cc38e879 100644
--- a/hooks/build
+++ b/hooks/build
@@ -3,9 +3,10 @@
 # Docker Daemon Build Hook
 # $IMAGE_NAME var is injected into the build so the tag is correct.
 
+docker pull ${DOCKER_REPO}:latest
+
 docker build \
-		--pull \
-		--cache-from=${IMAGE_NAME} \
+		--cache-from=${DOCKER_REPO}:latest \
 		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
 		--build-arg=VCS_REF="$(git rev-parse --short HEAD)" \
 		--build-arg=VERSION="$(cat VERSION)" \

From 4dfdc0dcfd47de5fc1d902210b1f2192df3f9aad Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 03:00:50 -0800
Subject: [PATCH 0121/1124] release 11.5.1-1


From aedbf5be01cab8d350f02f10b2eb81c60accf9c2 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Mon, 10 Dec 2018 03:23:43 -0800
Subject: [PATCH 0122/1124] Remove vesion from docker hub hook

---
 hooks/build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hooks/build b/hooks/build
index 7cc38e879..6b0c931ce 100644
--- a/hooks/build
+++ b/hooks/build
@@ -9,5 +9,4 @@ docker build \
 		--cache-from=${DOCKER_REPO}:latest \
 		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
 		--build-arg=VCS_REF="$(git rev-parse --short HEAD)" \
-		--build-arg=VERSION="$(cat VERSION)" \
 		-t ${IMAGE_NAME} .

From f276321ece8d24a8fc6b769d428d7a177eb31474 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 03:27:30 -0800
Subject: [PATCH 0123/1124] release 11.5.1-1


From cfcdfb450f1b414ed5f38d1d8ea7797bf61d4b3c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 03:31:01 -0800
Subject: [PATCH 0124/1124] Upgrade GitLab CE to 11.5.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 75fc0cec5..db5673132 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.2**
+- gitlab: upgrade CE to v11.5.2
+
 **11.5.1-1**
 - Fixed GitLab Dependencies
 
diff --git a/Dockerfile b/Dockerfile
index c6d5b0753..dd2521d63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.1
+ARG VERSION=11.5.2
 
 LABEL \
     maintainer="sameer@damagehead.com" \
diff --git a/README.md b/README.md
index 629a6ebe9..9f39daa16 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.1-1
+# sameersbn/gitlab:11.5.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1-1
+docker pull sameersbn/gitlab:11.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.1-1
+ sameersbn/gitlab:11.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.1-1
+    sameersbn/gitlab:11.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:sanitize
+    sameersbn/gitlab:11.5.2 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake db:setup
+    sameersbn/gitlab:11.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.1-1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1-1
+docker pull sameersbn/gitlab:11.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1-1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4d3032cbc..16ae142e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.1-1
+11.5.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 94506109b..13cd83657 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.1-1
+    image: sameersbn/gitlab:11.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f8061cf75..01341ec66 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.1-1
+docker pull sameersbn/gitlab:11.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.1-1
+sameersbn/gitlab:11.5.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 221bc5ea2..c6c9b0ceb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.1-1
+        image: sameersbn/gitlab:11.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 4063bdefc24a938932b0f0d4bd13e00031d9775a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 03:37:06 -0800
Subject: [PATCH 0125/1124] Fix formatting of components versions

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dd2521d63..1ec22a34d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,10 @@ LABEL \
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.10.5 \
-    GITLAB_SHELL_VERSION="8.4.1" \
-    GITLAB_WORKHORSE_VERSION="7.1.3" \
-    GITLAB_PAGES_VERSION="1.3.1" \
-    GITALY_SERVER_VERSION="0.129.0" \
+    GITLAB_SHELL_VERSION=8.4.1 \
+    GITLAB_WORKHORSE_VERSION=7.1.3 \
+    GITLAB_PAGES_VERSION=1.3.1 \
+    GITALY_SERVER_VERSION=0.129.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 70b6e711ebde8fff151a3e0c911ca747311f7723 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 04:11:55 -0800
Subject: [PATCH 0126/1124] release 11.5.2


From 3e5eced2adb6397c690d7eeb6a018629baa8bba8 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Mon, 10 Dec 2018 04:45:50 -0800
Subject: [PATCH 0127/1124] Move labels to lower a layer

---
 Dockerfile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ec22a34d..4777e5803 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,17 +4,6 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION=11.5.2
 
-LABEL \
-    maintainer="sameer@damagehead.com" \
-    org.label-schema.schema-version="1.0" \
-    org.label-schema.build-date=${BUILD_DATE} \
-    org.label-schema.name=gitlab \
-    org.label-schema.vendor=damagehead \
-    org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \
-    org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \
-    org.label-schema.vcs-ref=${VCS_REF} \
-    com.damagehead.gitlab.license=MIT
-
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.10.5 \
@@ -72,6 +61,17 @@ COPY assets/runtime/ ${GITLAB_RUNTIME_DIR}/
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod 755 /sbin/entrypoint.sh
 
+LABEL \
+    maintainer="sameer@damagehead.com" \
+    org.label-schema.schema-version="1.0" \
+    org.label-schema.build-date=${BUILD_DATE} \
+    org.label-schema.name=gitlab \
+    org.label-schema.vendor=damagehead \
+    org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \
+    org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \
+    org.label-schema.vcs-ref=${VCS_REF} \
+    com.damagehead.gitlab.license=MIT
+
 EXPOSE 22/tcp 80/tcp 443/tcp
 
 VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"]

From 8793e50cddf5eb200508a33bc2b77a763f826211 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 04:22:57 -0800
Subject: [PATCH 0128/1124] Upgrade GitLab CE to 11.5.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index db5673132..255dbe5c9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.3**
+- gitlab: upgrade CE to v11.5.3
+
 **11.5.2**
 - gitlab: upgrade CE to v11.5.2
 
diff --git a/Dockerfile b/Dockerfile
index 4777e5803..45742c1a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.2
+ARG VERSION=11.5.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 9f39daa16..eae9e9921 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.2
+# sameersbn/gitlab:11.5.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.2
+docker pull sameersbn/gitlab:11.5.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.2
+ sameersbn/gitlab:11.5.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.2
+    sameersbn/gitlab:11.5.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:sanitize
+    sameersbn/gitlab:11.5.3 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake db:setup
+    sameersbn/gitlab:11.5.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.2
+docker pull sameersbn/gitlab:11.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 16ae142e9..39eb3b4fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.2
+11.5.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 13cd83657..dec7637bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.2
+    image: sameersbn/gitlab:11.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 01341ec66..2668779d4 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.2
+docker pull sameersbn/gitlab:11.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.2
+sameersbn/gitlab:11.5.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c6c9b0ceb..2ec580d75 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.2
+        image: sameersbn/gitlab:11.5.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 184bda66075425be0fc7402a7a3bccee61cde5de Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 10 Dec 2018 04:55:12 -0800
Subject: [PATCH 0129/1124] release 11.5.3


From 6d0613e59b4e1fb8aecadc85c1b19b1be2e11048 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 10:20:36 +0100
Subject: [PATCH 0130/1124] Upgrade GitLab CE to 11.5.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 255dbe5c9..1b2b9827f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.4**
+- gitlab: upgrade CE to v11.5.4
+
 **11.5.3**
 - gitlab: upgrade CE to v11.5.3
 
diff --git a/Dockerfile b/Dockerfile
index 45742c1a6..99104740d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.3
+ARG VERSION=11.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index eae9e9921..0845a4c25 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.3
+# sameersbn/gitlab:11.5.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.3
+docker pull sameersbn/gitlab:11.5.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.3
+ sameersbn/gitlab:11.5.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.3
+    sameersbn/gitlab:11.5.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:sanitize
+    sameersbn/gitlab:11.5.4 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake db:setup
+    sameersbn/gitlab:11.5.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.3
+docker pull sameersbn/gitlab:11.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 39eb3b4fb..0cca32cae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.3
+11.5.4
diff --git a/docker-compose.yml b/docker-compose.yml
index dec7637bb..7d066f7ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.3
+    image: sameersbn/gitlab:11.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2668779d4..7d1808b53 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.3
+docker pull sameersbn/gitlab:11.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.3
+sameersbn/gitlab:11.5.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2ec580d75..d120911c7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.3
+        image: sameersbn/gitlab:11.5.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 9447dfb1ffd5cbf7e09692c1fc217048e6484d6e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 11:22:17 +0100
Subject: [PATCH 0131/1124] release 11.5.4


From 6131c5e0b64d59e9ab5ecb9de1819f4667b84562 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 11:26:00 +0100
Subject: [PATCH 0132/1124] Upgrade GitLab CE to 11.5.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1b2b9827f..2608a2578 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.5.5**
+- gitlab: upgrade CE to v11.5.5
+
 **11.5.4**
 - gitlab: upgrade CE to v11.5.4
 
diff --git a/Dockerfile b/Dockerfile
index 99104740d..30f49a039 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.4
+ARG VERSION=11.5.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 0845a4c25..e629a5d6c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.4
+# sameersbn/gitlab:11.5.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.4
+docker pull sameersbn/gitlab:11.5.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.4
+ sameersbn/gitlab:11.5.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.4
+    sameersbn/gitlab:11.5.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:sanitize
+    sameersbn/gitlab:11.5.5 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake db:setup
+    sameersbn/gitlab:11.5.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.5.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.5.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.4
+docker pull sameersbn/gitlab:11.5.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 0cca32cae..b0525db05 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.4
+11.5.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d066f7ff..edfeb7bb3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.4
+    image: sameersbn/gitlab:11.5.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7d1808b53..ca0fdb29a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.4
+docker pull sameersbn/gitlab:11.5.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.4
+sameersbn/gitlab:11.5.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d120911c7..30f53136c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.4
+        image: sameersbn/gitlab:11.5.5
         env:
         - name: TZ
           value: Asia/Kolkata

From fd3651e9f953602baa2fe963c48b3a5929798a7b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:06:03 +0100
Subject: [PATCH 0133/1124] release 11.5.5


From 0b72e43d7fcf40b3ce16af9ae5eaa9b010be50d4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:35:38 +0100
Subject: [PATCH 0134/1124] Upgrade GitLab CE to 11.6.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2608a2578..3c5c5ef2a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.0**
+- gitlab: upgrade CE to v11.6.0
+
 **11.5.5**
 - gitlab: upgrade CE to v11.5.5
 
diff --git a/Dockerfile b/Dockerfile
index 30f49a039..19b2ccaca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.5.5
+ARG VERSION=11.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index e629a5d6c..6014ff8ef 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.5.5
+# sameersbn/gitlab:11.6.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -127,7 +127,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.5.5
+docker pull sameersbn/gitlab:11.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -196,7 +196,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -231,7 +231,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -362,7 +362,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 #### Linking to MySQL Container
@@ -405,7 +405,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -432,7 +432,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 ### Linking to Redis Container
@@ -459,7 +459,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 ### Mail
@@ -472,7 +472,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -492,7 +492,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -569,7 +569,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -585,7 +585,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.5.5
+ sameersbn/gitlab:11.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -608,7 +608,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -656,7 +656,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.5.5
+    sameersbn/gitlab:11.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:sanitize
+    sameersbn/gitlab:11.6.0 app:sanitize
 ```
 
 ### Piwik
@@ -1111,7 +1111,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1139,14 +1139,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake db:setup
+    sameersbn/gitlab:11.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1204,7 +1204,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.5.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.5
+docker pull sameersbn/gitlab:11.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1301,7 +1301,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b0525db05..146d5de79 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.5.5
+11.6.0
diff --git a/docker-compose.yml b/docker-compose.yml
index edfeb7bb3..06f6d5c60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.5.5
+    image: sameersbn/gitlab:11.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ca0fdb29a..3af8824d5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.5.5
+docker pull sameersbn/gitlab:11.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.5.5
+sameersbn/gitlab:11.6.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 30f53136c..038909484 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.5.5
+        image: sameersbn/gitlab:11.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c93d2353aa1a626f4f19a1cfe67c2a23c784d9a9 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:35:45 +0100
Subject: [PATCH 0135/1124] Update gitlab-shell to 8.4.3

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 19b2ccaca..4674924d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=11.6.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.10.5 \
-    GITLAB_SHELL_VERSION=8.4.1 \
+    GITLAB_SHELL_VERSION=8.4.3 \
     GITLAB_WORKHORSE_VERSION=7.1.3 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=0.129.0 \

From a4c49bcd58bd54c51e65f62851b0f1fea01dbe14 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:35:45 +0100
Subject: [PATCH 0136/1124] Update gitlab-workhorse to 7.6.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4674924d0..460edee3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.10.5 \
     GITLAB_SHELL_VERSION=8.4.3 \
-    GITLAB_WORKHORSE_VERSION=7.1.3 \
+    GITLAB_WORKHORSE_VERSION=7.6.0 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=0.129.0 \
     GITLAB_USER="git" \

From b75862f4708fd29081f08458c94e5a0949cb5581 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:35:45 +0100
Subject: [PATCH 0137/1124] Update gitaly to 1.7.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 460edee3d..0ce861dcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.4.3 \
     GITLAB_WORKHORSE_VERSION=7.6.0 \
     GITLAB_PAGES_VERSION=1.3.1 \
-    GITALY_SERVER_VERSION=0.129.0 \
+    GITALY_SERVER_VERSION=1.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 7f349a35bbeda59d79bbdefb3dec481831f62831 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 12:50:17 +0100
Subject: [PATCH 0138/1124] Update golang to 1.11.4

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

diff --git a/Dockerfile b/Dockerfile
index 0ce861dcf..9526615b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=11.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
-    GOLANG_VERSION=1.10.5 \
+    GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.3 \
     GITLAB_WORKHORSE_VERSION=7.6.0 \
     GITLAB_PAGES_VERSION=1.3.1 \

From 5ed969bf1a4fdbd3afc594ef4fe4348c5cfd3f80 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 26 Dec 2018 13:17:31 +0100
Subject: [PATCH 0139/1124] Update to 11.6.0

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 3c5c5ef2a..823e6f176 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,10 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.6.0**
 - gitlab: upgrade CE to v11.6.0
+- Update gitaly to 1.7.1
+- Update gitlab-shell to 8.4.3
+- Update gitlab-workhorse to 7.6.0
+- Update golang to 1.11.4
 
 **11.5.5**
 - gitlab: upgrade CE to v11.5.5

From 5c59e16edb53976330dbcacfd5e22b265b780b2c Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Sat, 10 Nov 2018 23:37:48 +0100
Subject: [PATCH 0140/1124] Fix: Gitlab Pages Custom Domain Setup

---
 README.md                   |  1 +
 assets/runtime/env-defaults |  1 +
 assets/runtime/functions    | 87 ++++++++++++++++++++++---------------
 3 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 6014ff8ef..d95a9dc73 100644
--- a/README.md
+++ b/README.md
@@ -917,6 +917,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. |
+| `GITLAB_PAGES_NGINX_PROXY` | Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup. |
 | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. |
 | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` |
 | `GITALY_TOKEN` | Set a gitaly token, blank by default. |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 96a537f96..f593d0537 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -414,6 +414,7 @@ GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false}
 GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
 GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
 GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false}
+GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true}
 
 ## Gitaly
 GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index ce851b98f..0ebe8152b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1121,22 +1121,24 @@ nginx_configure_gitlab_hsts() {
   fi
 }
 
- nginx_configure_gitlab_ipv6() {
-   if [[ ! -f /proc/net/if_inet6 ]]; then
-     # disable ipv6 support in nginx for gitlab
-     sed -i \
-       -e "/listen \[::\]:80/d" \
-       -e "/listen \[::\]:443/d" \
-       ${GITLAB_NGINX_CONFIG}
-     # disable ipv6 support in nginx for pages
-     if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then
-       sed -i \
-         -e "/listen \[::\]:80/d" \
-         -e "/listen \[::\]:443/d" \
-         ${GITLAB_PAGES_NGINX_CONFIG}
-     fi
-   fi
- }
+nginx_configure_gitlab_ipv6() {
+  if [[ ! -f /proc/net/if_inet6 ]]; then
+    # disable ipv6 support in nginx for gitlab
+    sed -i \
+      -e "/listen \[::\]:80/d" \
+      -e "/listen \[::\]:443/d" \
+      ${GITLAB_NGINX_CONFIG}
+    # disable ipv6 support in nginx for pages
+    if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then
+      if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then
+        sed -i \
+          -e "/listen \[::\]:80/d" \
+          -e "/listen \[::\]:443/d" \
+          ${GITLAB_PAGES_NGINX_CONFIG}
+      fi
+    fi
+  fi
+}
 
 nginx_configure_gitlab_real_ip() {
   if [[ ${NGINX_REAL_IP_RECURSIVE} == on && \
@@ -1199,21 +1201,26 @@ nginx_configure_pages(){
   local GITLAB_PAGES_DOMAIN=$(echo $GITLAB_PAGES_DOMAIN | sed 's/\./\\\\./g')
   if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then
     echo "Configuring nginx::gitlab-pages..."
-    if [[ ${GITLAB_PAGES_HTTPS} == true ]]; then
-      update_template ${GITLAB_PAGES_NGINX_CONFIG} \
-        GITLAB_PORT \
-        GITLAB_PAGES_DOMAIN \
-        GITLAB_PAGES_PORT \
-        GITLAB_LOG_DIR \
-        GITLAB_PAGES_DOMAIN \
-        SSL_PAGES_CERT_PATH \
-        SSL_PAGES_KEY_PATH \
-        SSL_DHPARAM_PATH \
-        GITLAB_LOG_DIR
-    else
-      update_template ${GITLAB_PAGES_NGINX_CONFIG} \
-        GITLAB_PAGES_DOMAIN \
-        GITLAB_LOG_DIR
+    if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then
+      if [[ ${GITLAB_PAGES_HTTPS} == true ]]; then
+        update_template ${GITLAB_PAGES_NGINX_CONFIG} \
+          GITLAB_PORT \
+          GITLAB_PAGES_DOMAIN \
+          GITLAB_PAGES_PORT \
+          GITLAB_LOG_DIR \
+          GITLAB_PAGES_DOMAIN \
+          SSL_PAGES_CERT_PATH \
+          SSL_PAGES_KEY_PATH \
+          SSL_DHPARAM_PATH \
+          GITLAB_LOG_DIR
+      else
+        update_template ${GITLAB_PAGES_NGINX_CONFIG} \
+          GITLAB_PAGES_DOMAIN \
+          GITLAB_LOG_DIR
+      fi
+    else 
+      echo "Gitlab pages nginx proxy disabled"
+      echo "Assuming custom domain setup with own HTTP(S) load balancer'"
     fi
   fi
 }
@@ -1479,11 +1486,21 @@ install_configuration_templates() {
   ## ${GITLAB_PAGES_NGINX_CONFIG}
   if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then
     if [[ ${GITLAB_PAGES_HTTPS} == true && -f ${SSL_PAGES_CERT_PATH} && -f ${SSL_PAGES_KEY_PATH} ]]; then
-      install_template root: nginx/gitlab-pages-ssl ${GITLAB_PAGES_NGINX_CONFIG}
+      if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then
+        install_template root: nginx/gitlab-pages-ssl ${GITLAB_PAGES_NGINX_CONFIG}
+      else
+        echo "Gitlab pages nginx proxy disabled"
+        echo "Assuming custom domain setup with own HTTP(S) load balancer'"
+      fi
     else
-      echo "SSL Key, SSL Certificate were not found."
-      echo "Assuming that the container is running behind a HTTPS enabled load balancer."
-      install_template root: nginx/gitlab-pages ${GITLAB_PAGES_NGINX_CONFIG}
+      if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then
+        echo "SSL Key, SSL Certificate were not found."
+        echo "Assuming that the container is running behind a HTTPS enabled load balancer."
+        install_template root: nginx/gitlab-pages ${GITLAB_PAGES_NGINX_CONFIG}
+      else
+        echo "Gitlab pages nginx proxy disabled"
+        echo "Assuming custom domain setup with own HTTP(S) load balancer'"
+      fi
     fi
   fi
 

From e5feefa189a87b27c89f31c2c42f9330688a0b89 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Tue, 27 Nov 2018 15:15:13 +0100
Subject: [PATCH 0141/1124] fix-backup-subdirectory

---
 README.md                   | 3 ++-
 assets/runtime/env-defaults | 1 +
 assets/runtime/functions    | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d95a9dc73..16702ba8e 100644
--- a/README.md
+++ b/README.md
@@ -844,7 +844,8 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |
 | `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` |
 | `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` |
-| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up | Defaults to `true` |
+| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up. Defaults to `true` |
+| `GITLAB_BACKUP_DIR_GROUP` | Optionally group backups into a subfolder. Can also be used to place backups in to a subfolder on remote storage. Not used by default. |
 | `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` |
 | `GITLAB_DOWNLOADS_DIR` | The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`. |
 | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index f593d0537..476903100 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -6,6 +6,7 @@ DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT}
 GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp"
 GITLAB_BACKUP_DIR="${GITLAB_BACKUP_DIR:-$GITLAB_DATA_DIR/backups}"
 GITLAB_BACKUP_DIR_CHOWN=${GITLAB_BACKUP_DIR_CHOWN:-true}
+GITLAB_BACKUP_DIR_GROUP=${GITLAB_BACKUP_DIR_GROUP:-}
 GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}"
 GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}"
 GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 0ebe8152b..5ab2e09ff 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -784,7 +784,11 @@ gitlab_configure_backups_schedule() {
           weekly) day_of_week=0 ;;
           monthly) day_of_month=01 ;;
         esac
-        echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
+        if [[ -n ${GITLAB_BACKUP_DIR_GROUP} ]]; then
+            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
+        else 
+            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
+        fi
         crontab -u ${GITLAB_USER} /tmp/cron.${GITLAB_USER}
       fi
       rm -rf /tmp/cron.${GITLAB_USER}

From 33ef7ffde80988852b89313a1f9683f1d843ca80 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 28 Dec 2018 23:04:15 +0100
Subject: [PATCH 0142/1124] Add LDAP_USER_ATTRIBUTE_*

This will add misssing options to configure LDAP_USER_ATTRIBUTES

These will fix several Issues and merge multiple merge requests.

Fixes sameersbn#699
Fixes sameersbn#1746
Fixes sameersbn#1814

Signed-off-by: solidnerd <niclas@mietz.io>
---
 README.md                                 |  5 +++++
 assets/runtime/config/gitlabhq/gitlab.yml | 10 +++++-----
 assets/runtime/env-defaults               |  5 +++++
 assets/runtime/functions                  |  5 +++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 16702ba8e..ed326b9a5 100644
--- a/README.md
+++ b/README.md
@@ -1003,6 +1003,11 @@ Below is the complete list of available options that can be used to customize yo
 | `LDAP_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `false`. |
 | `LDAP_BASE` | Base where we can search for users. No default. |
 | `LDAP_USER_FILTER` | Filter LDAP users. No default. |
+| `LDAP_USER_ATTRIBUTE_USERNAME` | Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']` |
+| `LDAP_USER_ATTRIBUTE_MAIL` | Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']` |
+| `LDAP_USER_ATTRIBUTE_NAME` | Attribute field for the used username of a user. Default to `cn`. |
+| `LDAP_USER_ATTRIBUTE_FIRSTNAME` | Attribute field for the forename of a user. Default to `givenName` |
+| `LDAP_USER_ATTRIBUTE_LASTNAME` |  Attribute field for the surname of a user. Default to `sn` |
 | `LDAP_LOWERCASE_USERNAMES` | GitLab will lower case the username for the LDAP Server. Defaults to `false` |
 | `OAUTH_ENABLED` | Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`. |
 | `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` | Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 1c09c2c18..863105cbf 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -395,15 +395,15 @@ production: &base
           # them in issues, merge request and comments (like `@username`).
           # If the attribute specified for `username` contains an email address,
           # the GitLab username will be the part of the email address before the '@'.
-          username: ['uid', 'userid', 'sAMAccountName']
-          email:    ['mail', 'email', 'userPrincipalName']
+          username: {{LDAP_USER_ATTRIBUTE_USERNAME}}
+          email: {{LDAP_USER_ATTRIBUTE_MAIL}}
 
           # If no full name could be found at the attribute specified for `name`,
           # the full name is determined using the attributes specified for
           # `first_name` and `last_name`.
-          name:       'cn'
-          first_name: 'givenName'
-          last_name:  'sn'
+          name: '{{LDAP_USER_ATTRIBUTE_NAME}}'
+          first_name: '{{LDAP_USER_ATTRIBUTE_FIRSTNAME}}'
+          last_name: '{{LDAP_USER_ATTRIBUTE_LASTNAME}}'
 
           # If lowercase_usernames is enabled, GitLab will lower case the username.
           lowercase_usernames: {{LDAP_LOWERCASE_USERNAMES}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 476903100..17a0fbc8d 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -285,6 +285,11 @@ LDAP_ACTIVE_DIRECTORY=${LDAP_ACTIVE_DIRECTORY:-true}
 LDAP_BLOCK_AUTO_CREATED_USERS=${LDAP_BLOCK_AUTO_CREATED_USERS:-false}
 LDAP_BASE=${LDAP_BASE:-}
 LDAP_USER_FILTER=${LDAP_USER_FILTER:-}
+LDAP_USER_ATTRIBUTE_USERNAME=${LDAP_USER_ATTRIBUTE_USERNAME:-['uid', 'userid', 'sAMAccountName']}
+LDAP_USER_ATTRIBUTE_MAIL=${LDAP_USER_ATTRIBUTE_MAIL:-['mail', 'email', 'userPrincipalName']}
+LDAP_USER_ATTRIBUTE_NAME=${LDAP_USER_ATTRIBUTE_NAME:-cn}
+LDAP_USER_ATTRIBUTE_FIRSTNAME=${LDAP_USER_ATTRIBUTE_FIRSTNAME:-givenName}
+LDAP_USER_ATTRIBUTE_LASTNAME=${LDAP_USER_ATTRIBUTE_LASTNAME:-sn}
 LDAP_LOWERCASE_USERNAMES="${LDAP_LOWERCASE_USERNAMES:-false}"
 LDAP_LABEL=${LDAP_LABEL:-LDAP}
 LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5ab2e09ff..316c3e63c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -463,6 +463,11 @@ gitlab_configure_ldap() {
     LDAP_BASE \
     LDAP_USER_FILTER \
     LDAP_LOWERCASE_USERNAMES \
+    LDAP_USER_ATTRIBUTE_USERNAME \
+    LDAP_USER_ATTRIBUTE_MAIL \
+    LDAP_USER_ATTRIBUTE_NAME \
+    LDAP_USER_ATTRIBUTE_FIRSTNAME \
+    LDAP_USER_ATTRIBUTE_LASTNAME \
     LDAP_LABEL
 }
 

From cef00972a28f0696eafcbe6ad6db5ae21b110134 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 29 Dec 2018 00:10:27 +0100
Subject: [PATCH 0143/1124] Update Changelog for 11.6.0

---
 Changelog.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 823e6f176..5b3a23e3c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,14 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - Update gitlab-shell to 8.4.3
 - Update gitlab-workhorse to 7.6.0
 - Update golang to 1.11.4
+- Added `LDAP_USER_ATTRIBUTE_USERNAME`
+- Added `LDAP_USER_ATTRIBUTE_MAIL`
+- Added `LDAP_USER_ATTRIBUTE_NAME`
+- Added `LDAP_USER_ATTRIBUTE_FIRSTNAME`
+- Added `LDAP_USER_ATTRIBUTE_LASTNAME`
+- Added `GITLAB_BACKUP_DIR_CHOWN`
+- Added `GITLAB_BACKUP_DIR_GROUP`
+- Added `GITLAB_PAGES_NGINX_PROXY`
 
 **11.5.5**
 - gitlab: upgrade CE to v11.5.5

From a623f39fb15d8be91c13a0b2393dbd8369272754 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 29 Dec 2018 00:11:43 +0100
Subject: [PATCH 0144/1124] release 11.6.0


From ec4df3a82fb056fbf0bc8dd4bd13fffea5b3e5b0 Mon Sep 17 00:00:00 2001
From: Alexander Trost <galexrt@googlemail.com>
Date: Wed, 2 Jan 2019 12:32:39 +0100
Subject: [PATCH 0145/1124] Added OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
---
 README.md                                 |  1 +
 assets/runtime/config/gitlabhq/gitlab.yml |  3 ++-
 assets/runtime/env-defaults               |  1 +
 assets/runtime/functions                  | 17 ++++++++++-------
 contrib/docker-swarm/docker-compose.yml   |  1 +
 docker-compose.yml                        |  1 +
 docs/s3_compatible_storage.md             |  2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ed326b9a5..aafae2fa8 100644
--- a/README.md
+++ b/README.md
@@ -1050,6 +1050,7 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_SAML_GROUPS_ATTRIBUTE` | Map groups attribute in a SAMLResponse to external groups. No defaults. |
 | `OAUTH_SAML_EXTERNAL_GROUPS` | List of external groups in a SAMLResponse. Value is comma separated list of single quoted groups. Example: `'group1','group2'`. No defaults. |
 | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL` | Map 'email' attribute name in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
+| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME` | Map 'username' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
 | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME` | Map 'name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
 | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME` | Map 'first_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
 | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME` | Map 'last_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 863105cbf..5fd568124 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -158,7 +158,7 @@ production: &base
     object_store:
       enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
-      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. 
+      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
       background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
@@ -516,6 +516,7 @@ production: &base
                   attribute_statements: {
                     first_name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME}}'],
                     last_name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME}}'],
+                    username: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME}}'],
                     name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME}}'],
                     email: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL}}'] },
                   name_identifier_format: '{{OAUTH_SAML_NAME_IDENTIFIER_FORMAT}}' } }
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 17a0fbc8d..cf574b175 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -382,6 +382,7 @@ OAUTH_SAML_GROUPS_ATTRIBUTE=${OAUTH_SAML_GROUPS_ATTRIBUTE:-}
 OAUTH_SAML_EXTERNAL_GROUPS=${OAUTH_SAML_EXTERNAL_GROUPS:-}
 OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL:-}
 OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME:-}
+OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME:-}
 OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME:-}
 OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME:-}
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 316c3e63c..6ce2312d8 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -598,6 +598,9 @@ gitlab_configure_oauth_saml_attribute_statements() {
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME
     # Remove undefined optional attributes
+    exec_as_git sed -i "/email: \\[''\\],/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/name: \\[''\\],/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/username: \\[''\\],/d" ${GITLAB_CONFIG}
     exec_as_git sed -i "/first_name: \\[''\\],/d" ${GITLAB_CONFIG}
     exec_as_git sed -i "/last_name: \\[''\\],/d" ${GITLAB_CONFIG}
   else
@@ -791,7 +794,7 @@ gitlab_configure_backups_schedule() {
         esac
         if [[ -n ${GITLAB_BACKUP_DIR_GROUP} ]]; then
             echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
-        else 
+        else
             echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
         fi
         crontab -u ${GITLAB_USER} /tmp/cron.${GITLAB_USER}
@@ -972,7 +975,7 @@ gitlab_configure_artifacts() {
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
-  else 
+  else
    exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
   fi
 
@@ -998,7 +1001,7 @@ gitlab_configure_lfs() {
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
-  else 
+  else
     exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
   fi
 
@@ -1024,14 +1027,14 @@ gitlab_configure_uploads() {
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
-  else 
+  else
    exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
   fi
 
   echo "Configuring gitlab::uploads..."
   update_template ${GITLAB_CONFIG} \
     GITLAB_UPLOADS_STORAGE_PATH \
-    GITLAB_UPLOADS_BASE_DIR  
+    GITLAB_UPLOADS_BASE_DIR
 }
 
 gitlab_configure_mattermost() {
@@ -1227,7 +1230,7 @@ nginx_configure_pages(){
           GITLAB_PAGES_DOMAIN \
           GITLAB_LOG_DIR
       fi
-    else 
+    else
       echo "Gitlab pages nginx proxy disabled"
       echo "Assuming custom domain setup with own HTTP(S) load balancer'"
     fi
@@ -1550,7 +1553,7 @@ configure_gitlab() {
     GITLAB_PROJECTS_LIMIT \
     GITLAB_USERNAME_CHANGE \
     GITLAB_DEFAULT_THEME \
-    GITLAB_CREATE_GROUP 
+    GITLAB_CREATE_GROUP
 
   gitlab_configure_database
   gitlab_configure_redis
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0d20c4cbc..5779985d3 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -138,6 +138,7 @@ services:
     - OAUTH_SAML_EXTERNAL_GROUPS=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 06f6d5c60..fe2e33215 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -134,6 +134,7 @@ services:
     - OAUTH_SAML_EXTERNAL_GROUPS=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
 
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index adb4126f9..d876cc7a0 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -184,6 +184,7 @@ services:
     - OAUTH_SAML_EXTERNAL_GROUPS=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
     - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
     - OAUTH_CROWD_SERVER_URL=
@@ -236,4 +237,3 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:8.16.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
-

From 3c910cdb8f0760cba3e7d74b3eb11961c2ad21b4 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Wed, 28 Nov 2018 11:12:25 +0100
Subject: [PATCH 0146/1124] Fix Gitlab Pages Access Control

Signed-off-by: solidnerd <niclas@mietz.io>

# Conflicts:
#	README.md
#	assets/runtime/env-defaults
---
 README.md                   | 51 +++++++++++++++++++++++++++++++++++++
 assets/runtime/env-defaults |  5 ++++
 assets/runtime/functions    | 14 ++++++++++
 3 files changed, 70 insertions(+)

diff --git a/README.md b/README.md
index aafae2fa8..b4100672d 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@
         - [SAML](#saml)
         - [Crowd](#crowd)
         - [Microsoft Azure](#microsoft-azure)
+    - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
     - [Piwik](#piwik)
@@ -767,6 +768,51 @@ Once you have the Client ID, Client secret and Tenant ID generated, configure th
 
 For example, if your Client ID is `xxx`, the Client secret is `yyy` and the Tenant ID is `zzz`, then adding `--env 'OAUTH_AZURE_API_KEY=xxx' --env 'OAUTH_AZURE_API_SECRET=yyy' --env 'OAUTH_AZURE_TENANT_ID=zzz'` to the docker run command enables support for Microsoft Azure OAuth.
 
+### Gitlab Pages
+
+Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`.
+
+### Gitlab Pages Access Control
+
+Since version `11.5.0` Gitlab pages supports access control. This allows only access to a published website if you are a project member, or have access to a certain project.
+
+Gitlab pages access control requires additional configuration before activating it through the variable `GITLAB_PAGES_ACCESS_CONTROL`.
+
+Gitab pages access control makes use of the Gitlab OAuth Module.
+
+ - Goto the Gitlab Admin area
+ - Select `Applications` in the menu
+ - Create `New Application`
+   - Name: `Gitlab Pages`
+   - Scopes:
+     - api
+   - Trusted: NO (Do not select)
+   - Redirect URI: https://projects.<GITLAB_PAGES_DOMAIN>/auth
+
+Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is to following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint.
+
+This means that if you run your gitlab pages at domain `pages.example.io` this will be a wilcard domain where your projects are created based on their namespace. The best trick is to enter a NON-Existing gitlab project pages URI as the redirect URI.
+
+In the example above; the pages domain `projects` has been chosen. This will cause the nginx, either the built in or your own loadbalancer to redirect `*.<GITLAB_PAGES_DOMAIN>` to the `gitlab-pages` daemon. Which will trigger the pages endpoint.
+
+Make sure to choose own which does not exist and make sure that the request is routed to the `gitlab-pages` daemon if you are using your own HTTP load balancer in front of Gitlab.
+
+After creating the OAuth application endpoint for the Gitlab Pages Daemon. Gitlab pages access control can now be enabled.
+
+Add to following environment variables to your Gitlab Container.
+
+| Variable | R/O | Description |
+|----------|-----|-------------|
+| GITLAB_PAGES_ACCESS_CONTROL | Required | Set to `true` to enable access control. |
+| GITLAB_PAGES_ACCESS_SECRET | Optional | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. |
+| GITLAB_PAGES_ACCESS_CONTROL_SERVER | Required | Gitlab instance URI, example: `https://gitlab.example.io` |
+| GITLAB_PAGES_ACCESS_CLIENT_ID | Required | Client ID from earlier generated OAuth application |
+| GITLAB_PAGES_ACCESS_CLIENT_SECRET | Required | Client Secret from earlier genereated OAuth application |
+| GITLAB_PAGES_ACCESS_REDIRECT_URI | Required | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` |
+
+After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project.
+
+
 ### External Issue Trackers
 
 Since version `7.10.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
@@ -919,6 +965,11 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. |
 | `GITLAB_PAGES_NGINX_PROXY` | Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup. |
+| `GITLAB_PAGES_ACCESS_SECRET` | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. |
+| `GITLAB_PAGES_ACCESS_CONTROL_SERVER` | Gitlab instance URI, example: `https://gitlab.example.io` |
+| `GITLAB_PAGES_ACCESS_CLIENT_ID` | Client ID from earlier generated OAuth application |
+| `GITLAB_PAGES_ACCESS_CLIENT_SECRET` | Client Secret from earlier genereated OAuth application |
+| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` |
 | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. |
 | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` |
 | `GITALY_TOKEN` | Set a gitaly token, blank by default. |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index cf574b175..f44751a10 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -421,6 +421,11 @@ GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false}
 GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
 GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
 GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false}
+GITLAB_PAGES_ACCESS_CONTROL_SERVER=${GITLAB_PAGES_ACCESS_CONTROL_SERVER:-}
+GITLAB_PAGES_ACCESS_SECRET=${GITLAB_PAGES_ACCESS_SECRET:-}
+GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-}
+GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-}
+GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-}
 GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true}
 
 ## Gitaly
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 6ce2312d8..929ee8f02 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1631,6 +1631,20 @@ cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
 EOF
 fi
 
+if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
+  if [[ -z ${GITLAB_PAGES_ACCESS_SECRET} ]]; then
+    GITLAB_PAGES_ACCESS_SECRET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 40 ; echo '')
+  fi
+
+cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
+  -auth-server ${GITLAB_PAGES_ACCESS_CONTROL_SERVER}
+  -auth-secret ${GITLAB_PAGES_ACCESS_SECRET}
+  -auth-client-id ${GITLAB_PAGES_ACCESS_CLIENT_ID}
+  -auth-client-secret ${GITLAB_PAGES_ACCESS_CLIENT_SECRET}
+  -auth-redirect-uri ${GITLAB_PAGES_ACCESS_REDIRECT_URI}
+EOF
+fi
+
 cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
 user=git
 autostart=true

From 13e856141ec14eff47569bb765a08cd1ea7d0f8d Mon Sep 17 00:00:00 2001
From: Pierre Belloy <p.belloy@axelor.com>
Date: Mon, 31 Dec 2018 15:40:40 +0100
Subject: [PATCH 0147/1124] ADD GITLAB_IMPERSONATION_ENABLED

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 3 +++
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 1 +
 4 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index b4100672d..890e09a6d 100644
--- a/README.md
+++ b/README.md
@@ -876,6 +876,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
 | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
 | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. |
+| `GITLAB_IMPERSONATION_ENABLED` | Enable or disable impersonation. Defaults to `true`. |
 | `GITLAB_PROJECTS_LIMIT` | Set default projects limit. Defaults to `100`. |
 | `GITLAB_USERNAME_CHANGE` | Enable or disable ability for users to change their username. Defaults to `true`. |
 | `GITLAB_CREATE_GROUP` | Enable or disable ability for users to create groups. Defaults to `true`. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 5fd568124..5f203dc06 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -118,6 +118,9 @@ production: &base
     # The default is 'shared/cache/archive/' relative to the root of the Rails app.
     repository_downloads_path: {{GITLAB_DOWNLOADS_DIR}}
 
+    ## Impersonation settings
+    impersonation_enabled: {{GITLAB_IMPERSONATION_ENABLED}}
+
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
   # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index f44751a10..3b1f5bc3e 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -16,6 +16,7 @@ GITLAB_HTTPS=${GITLAB_HTTPS:-false}
 GITLAB_HOST=${GITLAB_HOST:-localhost}
 GITLAB_CI_HOST=${GITLAB_CI_HOST:-}
 GITLAB_PORT=${GITLAB_PORT:-}
+GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true}
 if [[ $GITLAB_HTTPS == true ]]; then
   GITLAB_PORT=${GITLAB_PORT:-443}
 else
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 929ee8f02..53e063c18 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1550,6 +1550,7 @@ configure_gitlab() {
     GITLAB_SSH_HOST \
     GITLAB_SSH_PORT \
     GITLAB_SIGNUP_ENABLED \
+    GITLAB_IMPERSONATION_ENABLED \
     GITLAB_PROJECTS_LIMIT \
     GITLAB_USERNAME_CHANGE \
     GITLAB_DEFAULT_THEME \

From 4284283859cdba070b03fb4e7a06be778e13b3af Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 1 Jan 2019 22:58:27 +0100
Subject: [PATCH 0148/1124] Upgrade GitLab CE to 11.6.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5b3a23e3c..aee4ec9bb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.1**
+- gitlab: upgrade CE to v11.6.1
+
 **11.6.0**
 - gitlab: upgrade CE to v11.6.0
 - Update gitaly to 1.7.1
diff --git a/Dockerfile b/Dockerfile
index 9526615b2..0e06ceb1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.0
+ARG VERSION=11.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 890e09a6d..0de7d9dfe 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.0
+# sameersbn/gitlab:11.6.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.0
+docker pull sameersbn/gitlab:11.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.0
+ sameersbn/gitlab:11.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.0
+    sameersbn/gitlab:11.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:sanitize
+    sameersbn/gitlab:11.6.1 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake db:setup
+    sameersbn/gitlab:11.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.0
+docker pull sameersbn/gitlab:11.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 146d5de79..1a31377d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.0
+11.6.1
diff --git a/docker-compose.yml b/docker-compose.yml
index fe2e33215..c84f8ef88 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.0
+    image: sameersbn/gitlab:11.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3af8824d5..90d98a803 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.0
+docker pull sameersbn/gitlab:11.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.0
+sameersbn/gitlab:11.6.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 038909484..f3dffba37 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.0
+        image: sameersbn/gitlab:11.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From fffe87747a6ca411d79d2a6f8b04b5ebe5966804 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 1 Jan 2019 23:02:10 +0100
Subject: [PATCH 0149/1124] Update base-image to 2018-12-18

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

diff --git a/Dockerfile b/Dockerfile
index 0e06ceb1b..d9f9718a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20181113
+FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF

From a15ba879db37149c8bcbe52d6a5ce94121f1f473 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 2 Jan 2019 13:51:28 +0100
Subject: [PATCH 0150/1124] Update Changelog for 11.6.1

---
 Changelog.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index aee4ec9bb..b6c119d2c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,13 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.6.1**
 - gitlab: upgrade CE to v11.6.1
+- Added `GITLAB_IMPERSONATION_ENABLED`
+- Added `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
+- Added `GITLAB_PAGES_ACCESS_CONTROL_SERVER`
+- Added `GITLAB_PAGES_ACCESS_CLIENT_ID`
+- Added `GITLAB_PAGES_ACCESS_CLIENT_SECRET`
+- Added `GITLAB_PAGES_ACCESS_SECRET`
+- Added `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
 **11.6.0**
 - gitlab: upgrade CE to v11.6.0

From 011b0af72f2cbed5c2fd8046d8f371658b59675e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 2 Jan 2019 13:52:24 +0100
Subject: [PATCH 0151/1124] release 11.6.1


From 2ca3c61261b6c2055109cb9f04fa8793aa4ef5bc Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Thu, 3 Jan 2019 19:16:57 +0530
Subject: [PATCH 0152/1124] fix image builds on docker hub

---
 Dockerfile              | 2 +-
 assets/build/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9f9718a1..d1b26065a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN apt-get update \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
- && gem install --no-document bundler \
+ && gem install --no-document bundler -v 1.17.3 \
  && rm -rf /var/lib/apt/lists/*
 
 COPY assets/build/ ${GITLAB_BUILD_DIR}/
diff --git a/assets/build/install.sh b/assets/build/install.sh
index bd0e11247..8eb9ecadb 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -166,7 +166,7 @@ exec_as_git yarn install --production --pure-lockfile
 exec_as_git yarn add ajv@^4.0.0
 
 echo "Compiling assets. Please be patient, this could take a while..."
-exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true
+exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096"
 
 # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml
 rm -rf ${GITLAB_DATA_DIR}/config/secrets.yml

From b7df78ca004f21a1a68fac5c53bd80fdece0ea7b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 3 Jan 2019 10:07:33 +0100
Subject: [PATCH 0153/1124] Upgrade GitLab CE to 11.6.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b6c119d2c..c3331b142 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.2**
+- gitlab: upgrade CE to v11.6.2
+
 **11.6.1**
 - gitlab: upgrade CE to v11.6.1
 - Added `GITLAB_IMPERSONATION_ENABLED`
diff --git a/Dockerfile b/Dockerfile
index d1b26065a..ad63fe528 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.1
+ARG VERSION=11.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 0de7d9dfe..585cde78d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.1
+# sameersbn/gitlab:11.6.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.1
+docker pull sameersbn/gitlab:11.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.1
+ sameersbn/gitlab:11.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.1
+    sameersbn/gitlab:11.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:sanitize
+    sameersbn/gitlab:11.6.2 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake db:setup
+    sameersbn/gitlab:11.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.1
+docker pull sameersbn/gitlab:11.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1a31377d5..48f8d64e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.1
+11.6.2
diff --git a/docker-compose.yml b/docker-compose.yml
index c84f8ef88..d0a21e228 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.1
+    image: sameersbn/gitlab:11.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 90d98a803..edd4ee585 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.1
+docker pull sameersbn/gitlab:11.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.1
+sameersbn/gitlab:11.6.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f3dffba37..a42b7db06 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.1
+        image: sameersbn/gitlab:11.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 0b3e863457d7eabc499ca81a03d936239eac3c02 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 5 Jan 2019 22:56:42 +0100
Subject: [PATCH 0154/1124] release 11.6.2


From 6e8e04c2959c31f8d15b3323b4cadd21e3d409df Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 5 Jan 2019 22:54:31 +0100
Subject: [PATCH 0155/1124] Upgrade GitLab CE to 11.6.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c3331b142..7f7139f43 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.3**
+- gitlab: upgrade CE to v11.6.3
+
 **11.6.2**
 - gitlab: upgrade CE to v11.6.2
 
diff --git a/Dockerfile b/Dockerfile
index ad63fe528..bc309acf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.2
+ARG VERSION=11.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 585cde78d..4cb780022 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.2
+# sameersbn/gitlab:11.6.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.2
+docker pull sameersbn/gitlab:11.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.2
+ sameersbn/gitlab:11.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.2
+    sameersbn/gitlab:11.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:sanitize
+    sameersbn/gitlab:11.6.3 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake db:setup
+    sameersbn/gitlab:11.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.2
+docker pull sameersbn/gitlab:11.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 48f8d64e0..546fe2354 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.2
+11.6.3
diff --git a/docker-compose.yml b/docker-compose.yml
index d0a21e228..812b70edb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.2
+    image: sameersbn/gitlab:11.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index edd4ee585..fa824a220 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.2
+docker pull sameersbn/gitlab:11.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.2
+sameersbn/gitlab:11.6.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a42b7db06..abc7eaf73 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.2
+        image: sameersbn/gitlab:11.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From df2c38d9da9c625bf54c5b051a6e7a7cdf8f0a85 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 7 Jan 2019 21:19:12 +0100
Subject: [PATCH 0156/1124] release 11.6.3


From c29086dcd970f1a0867aa22ea526bac4a1c336de Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 16 Jan 2019 20:58:17 +0100
Subject: [PATCH 0157/1124] Upgrade GitLab CE to 11.6.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7f7139f43..87b359f3a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.4**
+- gitlab: upgrade CE to v11.6.4
+
 **11.6.3**
 - gitlab: upgrade CE to v11.6.3
 
diff --git a/Dockerfile b/Dockerfile
index bc309acf4..1edf03f39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.3
+ARG VERSION=11.6.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 4cb780022..eee895268 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.3
+# sameersbn/gitlab:11.6.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.3
+docker pull sameersbn/gitlab:11.6.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.3
+ sameersbn/gitlab:11.6.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.3
+    sameersbn/gitlab:11.6.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:sanitize
+    sameersbn/gitlab:11.6.4 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake db:setup
+    sameersbn/gitlab:11.6.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.3
+docker pull sameersbn/gitlab:11.6.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 546fe2354..1baf6d5a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.3
+11.6.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 812b70edb..6f4df6722 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.3
+    image: sameersbn/gitlab:11.6.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fa824a220..ec3fa6b85 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.3
+docker pull sameersbn/gitlab:11.6.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.3
+sameersbn/gitlab:11.6.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index abc7eaf73..9fa30c2c2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.3
+        image: sameersbn/gitlab:11.6.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 172588746a7bfc08d65e5c33e5afb61c749cef7e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 19 Jan 2019 09:25:44 +0100
Subject: [PATCH 0158/1124] release 11.6.4


From 9f821fd4bf685b5bed87e3f3615b93120b24528e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 19 Jan 2019 09:27:13 +0100
Subject: [PATCH 0159/1124] Upgrade GitLab CE to 11.6.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 87b359f3a..edf147569 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.6.5**
+- gitlab: upgrade CE to v11.6.5
+
 **11.6.4**
 - gitlab: upgrade CE to v11.6.4
 
diff --git a/Dockerfile b/Dockerfile
index 1edf03f39..d404a96e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.4
+ARG VERSION=11.6.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index eee895268..1fcfb2b6c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.4
+# sameersbn/gitlab:11.6.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.4
+docker pull sameersbn/gitlab:11.6.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.4
+ sameersbn/gitlab:11.6.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.4
+    sameersbn/gitlab:11.6.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:sanitize
+    sameersbn/gitlab:11.6.5 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake db:setup
+    sameersbn/gitlab:11.6.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.6.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.6.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.4
+docker pull sameersbn/gitlab:11.6.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1baf6d5a8..ee5d7542c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.4
+11.6.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f4df6722..d6b352ddf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.4
+    image: sameersbn/gitlab:11.6.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ec3fa6b85..c186bc333 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.4
+docker pull sameersbn/gitlab:11.6.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.4
+sameersbn/gitlab:11.6.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9fa30c2c2..e5b875060 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.4
+        image: sameersbn/gitlab:11.6.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 2144b7f5b3414d09d8b81f69bab9993268330ae2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 20 Jan 2019 08:39:42 +0100
Subject: [PATCH 0160/1124] release 11.6.5


From 5eb7c43ce4640913183d04fe6e4878811886bdf6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Jan 2019 08:10:10 +0100
Subject: [PATCH 0161/1124] Upgrade GitLab CE to 11.7.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index edf147569..82bba70a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.7.0**
+- gitlab: upgrade CE to v11.7.0
+
 **11.6.5**
 - gitlab: upgrade CE to v11.6.5
 
diff --git a/Dockerfile b/Dockerfile
index d404a96e2..a0be23266 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.6.5
+ARG VERSION=11.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 1fcfb2b6c..721654293 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.6.5
+# sameersbn/gitlab:11.7.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.6.5
+docker pull sameersbn/gitlab:11.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.6.5
+ sameersbn/gitlab:11.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.6.5
+    sameersbn/gitlab:11.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:sanitize
+    sameersbn/gitlab:11.7.0 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake db:setup
+    sameersbn/gitlab:11.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.6.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.5
+docker pull sameersbn/gitlab:11.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ee5d7542c..308bbae79 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.6.5
+11.7.0
diff --git a/docker-compose.yml b/docker-compose.yml
index d6b352ddf..dd437e937 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.6.5
+    image: sameersbn/gitlab:11.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c186bc333..bd214b0b6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.6.5
+docker pull sameersbn/gitlab:11.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.6.5
+sameersbn/gitlab:11.7.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e5b875060..6280066dc 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.6.5
+        image: sameersbn/gitlab:11.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 4849e7fa55a45e3456bf2bc51c3993408ca6bae4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Jan 2019 08:10:19 +0100
Subject: [PATCH 0162/1124] Update gitlab-shell to 8.4.4

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a0be23266..f7acb00d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=11.7.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
-    GITLAB_SHELL_VERSION=8.4.3 \
+    GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=7.6.0 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.7.1 \

From b893869aed175939cc1d87f88e865096d7118f24 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Jan 2019 08:10:20 +0100
Subject: [PATCH 0163/1124] Update gitlab-workhorse to 8.0.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f7acb00d2..2ac3fdfcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
-    GITLAB_WORKHORSE_VERSION=7.6.0 \
+    GITLAB_WORKHORSE_VERSION=8.0.0 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.7.1 \
     GITLAB_USER="git" \

From f841122e767dc30175f2de8b043696f2238ff38d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Jan 2019 08:10:20 +0100
Subject: [PATCH 0164/1124] Update gitaly to 1.12.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2ac3fdfcd..b13a116d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.0.0 \
     GITLAB_PAGES_VERSION=1.3.1 \
-    GITALY_SERVER_VERSION=1.7.1 \
+    GITALY_SERVER_VERSION=1.12.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From fa2701679469c215a9f07860bfa20a3c45ec0728 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 23 Jan 2019 07:44:20 +0100
Subject: [PATCH 0165/1124] release 11.7.0


From 8fc04134d11780e3e2bef830d25ac5fa7bac0976 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 1 Feb 2019 11:32:06 +0300
Subject: [PATCH 0166/1124] Upgrade GitLab CE to 11.7.3

---
 Changelog.md               |  5 +++-
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 82bba70a9..997fb7a88 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.7.3**
+- gitlab: upgrade CE to v11.7.3
+
 **11.7.0**
 - gitlab: upgrade CE to v11.7.0
 
@@ -113,7 +116,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - gitlab: upgrade CE to v11.3.0
 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
 - Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699)
-- Fix gitlay-ssh symlink to enable rebase/squash in forks 
+- Fix gitlay-ssh symlink to enable rebase/squash in forks
 
 **11.2.3**
 - gitlab: upgrade CE to v11.2.3
diff --git a/Dockerfile b/Dockerfile
index b13a116d6..dc8c4dc42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.7.0
+ARG VERSION=11.7.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 721654293..0fd85e87b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.7.0
+# sameersbn/gitlab:11.7.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.7.0
+docker pull sameersbn/gitlab:11.7.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.7.0
+ sameersbn/gitlab:11.7.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.7.0
+    sameersbn/gitlab:11.7.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:sanitize
+    sameersbn/gitlab:11.7.3 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake db:setup
+    sameersbn/gitlab:11.7.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.7.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.0
+docker pull sameersbn/gitlab:11.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 308bbae79..7687edc13 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.7.0
+11.7.3
diff --git a/docker-compose.yml b/docker-compose.yml
index dd437e937..34b59a578 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.7.0
+    image: sameersbn/gitlab:11.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bd214b0b6..1b1f7fc84 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.0
+docker pull sameersbn/gitlab:11.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.7.0
+sameersbn/gitlab:11.7.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6280066dc..5b18fdbe0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.7.0
+        image: sameersbn/gitlab:11.7.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 1a59542e93260a314618af102e0231b20958dacf Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 1 Feb 2019 11:39:42 +0300
Subject: [PATCH 0167/1124] Update gitlab-workhorse to 8.1.1

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

diff --git a/Dockerfile b/Dockerfile
index dc8c4dc42..4d57d718a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
-    GITLAB_WORKHORSE_VERSION=8.0.0 \
+    GITLAB_WORKHORSE_VERSION=8.1.1 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.12.1 \
     GITLAB_USER="git" \

From bd0efed161ebf5519e4bbc439abcfe892fc8c24e Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 1 Feb 2019 11:46:58 +0300
Subject: [PATCH 0168/1124] Update gitaly to 1.13.0

---
 Changelog.md | 2 ++
 Dockerfile   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 997fb7a88..1e8a37c29 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.7.3**
 - gitlab: upgrade CE to v11.7.3
+- Update gitlab-workhorse to 8.1.1
+- Update gitaly to 1.13.0
 
 **11.7.0**
 - gitlab: upgrade CE to v11.7.0
diff --git a/Dockerfile b/Dockerfile
index 4d57d718a..f691913a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.1.1 \
     GITLAB_PAGES_VERSION=1.3.1 \
-    GITALY_SERVER_VERSION=1.12.1 \
+    GITALY_SERVER_VERSION=1.13.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From c19a365227e0feadfa60849f1665f495e0604e6a Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 1 Feb 2019 11:48:21 +0300
Subject: [PATCH 0169/1124] Update gitlab-pages to 1.4.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1e8a37c29..aee8be327 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - gitlab: upgrade CE to v11.7.3
 - Update gitlab-workhorse to 8.1.1
 - Update gitaly to 1.13.0
+- Update gitlab-pages to 1.4.0
 
 **11.7.0**
 - gitlab: upgrade CE to v11.7.0
diff --git a/Dockerfile b/Dockerfile
index f691913a2..f5cb677b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.1.1 \
-    GITLAB_PAGES_VERSION=1.3.1 \
+    GITLAB_PAGES_VERSION=1.4.0 \
     GITALY_SERVER_VERSION=1.13.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 3dae4bd07c25d17c40724e3778535cc51d15abe2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 5 Feb 2019 07:14:29 +0100
Subject: [PATCH 0170/1124] release 11.7.3


From 622f55c54fd928b2b4051af0821314f84eb8700f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 07:14:02 +0100
Subject: [PATCH 0171/1124] Upgrade GitLab CE to 11.7.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aee8be327..366a888b0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.7.4**
+- gitlab: upgrade CE to v11.7.4
+
 **11.7.3**
 - gitlab: upgrade CE to v11.7.3
 - Update gitlab-workhorse to 8.1.1
diff --git a/Dockerfile b/Dockerfile
index f5cb677b7..42b0ec020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.7.3
+ARG VERSION=11.7.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 0fd85e87b..d1ab5aaaa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.7.3
+# sameersbn/gitlab:11.7.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.7.3
+docker pull sameersbn/gitlab:11.7.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.7.3
+ sameersbn/gitlab:11.7.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.7.3
+    sameersbn/gitlab:11.7.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:sanitize
+    sameersbn/gitlab:11.7.4 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake db:setup
+    sameersbn/gitlab:11.7.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.7.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.3
+docker pull sameersbn/gitlab:11.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 7687edc13..6e0095516 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.7.3
+11.7.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 34b59a578..19230fb66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.7.3
+    image: sameersbn/gitlab:11.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1b1f7fc84..544023c49 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.3
+docker pull sameersbn/gitlab:11.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.7.3
+sameersbn/gitlab:11.7.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5b18fdbe0..25ce31dfe 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.7.3
+        image: sameersbn/gitlab:11.7.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 155266db59195470033ba9c7f90c5b4523c0c8cf Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 07:14:12 +0100
Subject: [PATCH 0172/1124] Update gitlab-workhorse to 8.0.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 42b0ec020..62edbbf7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
-    GITLAB_WORKHORSE_VERSION=8.1.1 \
+    GITLAB_WORKHORSE_VERSION=8.0.1 \
     GITLAB_PAGES_VERSION=1.4.0 \
     GITALY_SERVER_VERSION=1.13.0 \
     GITLAB_USER="git" \

From 9a4b59e0675fbdff0bc43a40c9660fb02fa8ea27 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 07:14:12 +0100
Subject: [PATCH 0173/1124] Update gitlab-pages to 1.3.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 62edbbf7b..3a12bb4af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.0.1 \
-    GITLAB_PAGES_VERSION=1.4.0 \
+    GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.13.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From cc21c60cd3ffb34f2d4fcd11ca23f2b259f17fa4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 07:14:12 +0100
Subject: [PATCH 0174/1124] Update gitaly to 1.12.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3a12bb4af..947c7fc6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.0.1 \
     GITLAB_PAGES_VERSION=1.3.1 \
-    GITALY_SERVER_VERSION=1.13.0 \
+    GITALY_SERVER_VERSION=1.12.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From ec07b0eddb4ca8429f735162535d24df49a46258 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 22:08:36 +0100
Subject: [PATCH 0175/1124] release 11.7.4


From 09acdb68312b10ff1bcd695d850d80ef39621c7d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 22:12:56 +0100
Subject: [PATCH 0176/1124] Upgrade GitLab CE to 11.7.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 366a888b0..353e495a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.7.5**
+- gitlab: upgrade CE to v11.7.5
+
 **11.7.4**
 - gitlab: upgrade CE to v11.7.4
 
diff --git a/Dockerfile b/Dockerfile
index 947c7fc6d..fb8fe9984 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.7.4
+ARG VERSION=11.7.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index d1ab5aaaa..ed1f52212 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.7.4
+# sameersbn/gitlab:11.7.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.7.4
+docker pull sameersbn/gitlab:11.7.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.7.4
+ sameersbn/gitlab:11.7.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.7.4
+    sameersbn/gitlab:11.7.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:sanitize
+    sameersbn/gitlab:11.7.5 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1199,14 +1199,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake db:setup
+    sameersbn/gitlab:11.7.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1264,7 +1264,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.7.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.4
+docker pull sameersbn/gitlab:11.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1361,7 +1361,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 6e0095516..64e4bdff1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.7.4
+11.7.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 19230fb66..47ab59388 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.7.4
+    image: sameersbn/gitlab:11.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 544023c49..b7be5fcbe 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.4
+docker pull sameersbn/gitlab:11.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.7.4
+sameersbn/gitlab:11.7.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 25ce31dfe..ede479a84 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.7.4
+        image: sameersbn/gitlab:11.7.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 0566350e96cb685394005ebb14ede74c52ed9587 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 22:13:02 +0100
Subject: [PATCH 0177/1124] Update gitlab-workhorse to 8.0.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fb8fe9984..21e2a9318 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
-    GITLAB_WORKHORSE_VERSION=8.0.1 \
+    GITLAB_WORKHORSE_VERSION=8.0.2 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.12.2 \
     GITLAB_USER="git" \

From ff97c1dc47f9f7239d50e83009106ab29ab6584d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 8 Feb 2019 22:13:41 +0100
Subject: [PATCH 0178/1124] release 11.7.5


From f307379e594b5b8d00a7159cc8dbe7fb385ccde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= <hack@f3l1x.io>
Date: Fri, 11 Jan 2019 18:18:17 +0100
Subject: [PATCH 0179/1124] Readme: document missing GITLAB_DEFAULT_THEME

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ed1f52212..4039cd74b 100644
--- a/README.md
+++ b/README.md
@@ -873,6 +873,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. |
 | `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. |
 | `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. |
+| `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) |
 | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
 | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
 | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. |

From d902ec2ff8f633f664016e7efa05c71cb886877a Mon Sep 17 00:00:00 2001
From: Don Bowman <db@donbowman.ca>
Date: Wed, 6 Feb 2019 20:16:43 -0500
Subject: [PATCH 0180/1124] Add support for `receive.advertisePushOptions`

See [install](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md)
which suggests doing:

```
sudo -u git -H git config --global receive.advertisePushOptions true
```

Signed-off-by: Don Bowman <db@donbowman.ca>
---
 assets/build/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 8eb9ecadb..bcca8cdd1 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -62,6 +62,8 @@ EOF
 exec_as_git git config --global core.autocrlf input
 exec_as_git git config --global gc.auto 0
 exec_as_git git config --global repack.writeBitmaps true
+exec_as_git git config --global receive.advertisePushOptions true
+
 
 # shallow clone gitlab-ce
 echo "Cloning gitlab-ce v.${GITLAB_VERSION}..."

From b088f4b26813dede58fa8aee614680db0fa8f119 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 22 Feb 2019 09:57:03 +0300
Subject: [PATCH 0181/1124] Upgrade GitLab CE to 11.8.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 353e495a5..551f05303 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.8.0**
+- gitlab: upgrade CE to v11.8.0
+
 **11.7.5**
 - gitlab: upgrade CE to v11.7.5
 
diff --git a/Dockerfile b/Dockerfile
index 21e2a9318..1d1256667 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.7.5
+ARG VERSION=11.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 4039cd74b..c917d84d6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.7.5
+# sameersbn/gitlab:11.8.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.7.5
+docker pull sameersbn/gitlab:11.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.7.5
+ sameersbn/gitlab:11.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.7.5
+    sameersbn/gitlab:11.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:sanitize
+    sameersbn/gitlab:11.8.0 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1200,14 +1200,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake db:setup
+    sameersbn/gitlab:11.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1216,7 +1216,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1265,7 +1265,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1278,7 +1278,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1309,7 +1309,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1331,12 +1331,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.5
+docker pull sameersbn/gitlab:11.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1362,7 +1362,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 64e4bdff1..897063bb3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.7.5
+11.8.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 47ab59388..dae4b9b69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.7.5
+    image: sameersbn/gitlab:11.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b7be5fcbe..ce8e07e2d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.7.5
+docker pull sameersbn/gitlab:11.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.7.5
+sameersbn/gitlab:11.8.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ede479a84..22d5fe0b7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.7.5
+        image: sameersbn/gitlab:11.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8434ab1351abe45f9d32a94d6477bdd02df9052a Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 22 Feb 2019 10:00:52 +0300
Subject: [PATCH 0182/1124] Update gitlab-workhorse to 8.3.1

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 551f05303..399b47a77 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.8.0**
 - gitlab: upgrade CE to v11.8.0
+- Update gitlab-workhorse to 8.3.1
 
 **11.7.5**
 - gitlab: upgrade CE to v11.7.5
diff --git a/Dockerfile b/Dockerfile
index 1d1256667..478e6750c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
-    GITLAB_WORKHORSE_VERSION=8.0.2 \
+    GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.3.1 \
     GITALY_SERVER_VERSION=1.12.2 \
     GITLAB_USER="git" \

From f41ddd869ff2d7ed3cfac2fc74b4697380b06df7 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Sat, 23 Feb 2019 20:42:44 +0300
Subject: [PATCH 0183/1124] Update gitaly to 1.20.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 399b47a77..c365c3ef7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 **11.8.0**
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
+- Update gitaly to 1.20.0
 
 **11.7.5**
 - gitlab: upgrade CE to v11.7.5
diff --git a/Dockerfile b/Dockerfile
index 478e6750c..279a781f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.3.1 \
-    GITALY_SERVER_VERSION=1.12.2 \
+    GITALY_SERVER_VERSION=1.20.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From bdf51b75f8384a762d290027a7f80eab5f671630 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Sat, 23 Feb 2019 20:44:22 +0300
Subject: [PATCH 0184/1124] Update gitlab-pages to 1.5.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c365c3ef7..659f5e28c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
 - Update gitaly to 1.20.0
+- Update gitlab-pages to 1.5.0
 
 **11.7.5**
 - gitlab: upgrade CE to v11.7.5
diff --git a/Dockerfile b/Dockerfile
index 279a781f4..132aa5e9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.11.4 \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
-    GITLAB_PAGES_VERSION=1.3.1 \
+    GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.20.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From a16f1f88ee43e0c600d7e14edab5614409058c6d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 28 Feb 2019 10:23:25 +0100
Subject: [PATCH 0185/1124] release 11.8.0


From 21778c0cf59fa0389cad216d72fef247276c6a73 Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 19:40:17 +0800
Subject: [PATCH 0186/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c917d84d6..312b2024c 100644
--- a/README.md
+++ b/README.md
@@ -887,6 +887,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. |
 | `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. |
 | `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. |
+| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. |
 | `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. |
 | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` |
 | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |

From 1a13c9f10c55c6690826b99aeb4a86f55ffc3941 Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 21:09:54 +0800
Subject: [PATCH 0187/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 assets/runtime/env-defaults | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 3b1f5bc3e..7c4c0221c 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -435,6 +435,9 @@ GITALY_TOKEN=${GITALY_TOKEN:-}
 GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket
 GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH}
 
+## GitLab Shell
+GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_INSTALL_DIR/hooks"}
+
 ## MONITORING
 GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10}
 GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}

From 5466c0d43df68ad950969042099768f9067fb984 Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 22:02:24 +0800
Subject: [PATCH 0188/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 assets/runtime/functions | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 53e063c18..ee80cacd2 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1600,6 +1600,13 @@ configure_gitlab_shell() {
     REDIS_HOST \
     REDIS_PORT \
     REDIS_DB_NUMBER
+
+  # update custom_hooks_dir if set $GITLAB_SHELL_CUSTOM_HOOKS_DIR
+  if [[ -n ${GITLAB_SHELL_CUSTOM_HOOKS_DIR} ]]; then
+    exec_as_git sed -i \
+      "s|custom_hooks_dir:.*|custom_hooks_dir: $GITLAB_SHELL_CUSTOM_HOOKS_DIR|g" \
+      ${GITLAB_SHELL_CONFIG}
+  fi
 }
 
 

From 76bfb2f1e09848217591d2e35177f6e7843496bd Mon Sep 17 00:00:00 2001
From: David Rubin <davidrub@gmail.com>
Date: Sat, 23 Feb 2019 14:56:51 +0100
Subject: [PATCH 0189/1124] Support Google Cloud Object Store

---
 README.md                                 | 26 +++++++--
 assets/runtime/config/gitlabhq/gitlab.yml | 33 +++++++++---
 assets/runtime/env-defaults               | 49 +++++++++++++----
 assets/runtime/functions                  | 64 ++++++++++++++++++++---
 4 files changed, 145 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index c917d84d6..465f01f08 100644
--- a/README.md
+++ b/README.md
@@ -899,18 +899,28 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` |
 | `GITLAB_ARTIFACTS_ENABLED` | Enable/Disable GitLab artifacts support. Defaults to `true`. |
 | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
+| `AWS_ACCESS_KEY_ID`| Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`|
+| `AWS_SECRET_ACCESS_KEY`| Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`|
+| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Default Google project to use for Object Store.|
+| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Default Google service account email to use for Object Store.|
+| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file Defaults to `/gcs/key.json`|
+| `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`| Default object store connection provider. Defaults to `AWS`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
+
 | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
 | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
 | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
@@ -918,26 +928,32 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the LFS. Defaults to `lfs-object` |
 | `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
 | `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
 | `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. |
 | `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` |
 | `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` | Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` |
 | `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the UPLOADS. Defaults to `uploads` |
 | `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
 | `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
 | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. |
 | `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. |
 | `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 5f203dc06..3d36a8785 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -165,14 +165,20 @@ production: &base
       background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
-        provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
+        provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}}
+        #start-artifacts-aws
         aws_access_key_id: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
         path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-
+        #end-artifacts-aws
+        #start-artifacts-gcs
+        google_project: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        #end-artifacts-gcs
 
   ## Git LFS
   lfs:
@@ -186,15 +192,22 @@ production: &base
       background_upload: {{GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
-        provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
+        provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}}
+        #start-lfs-aws
         aws_access_key_id: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
         path_style: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-
-
+        #end-lfs-aws
+        #start-lfs-gcs
+        google_project: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        #end-lfs-gcs
+
+        
   ## Uploads (attachments, avatars, etc...)
   uploads:
     # The location where uploads objects are stored (default: public/).
@@ -207,14 +220,20 @@ production: &base
       background_upload: {{GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
-        provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
+        provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}}
+        #start-uploads-aws
         aws_access_key_id: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
         path_style: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-
+        #end-uploads-aws
+        #start-uploads-gcs
+        google_project: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        #end-uploads-gcs
 
 
   ## GitLab Pages
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 3b1f5bc3e..4c4318b8e 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -90,23 +90,39 @@ GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
 
 GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}
 
+# OBJECTSTORE 
+GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
+AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
+AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
+GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-"/gcs/key.json"}
+
 ## ARTIFACTS
 GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true}
 GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"
 
+
 GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts}
 GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
+
+# ARTIFACTS:AWS
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
 
+# ARTIFACTS:Google
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
+
 
 ## Cron Jobs
 GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"}
@@ -120,14 +136,21 @@ GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECT
 GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD:-false}
 GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
+
+# LFS:AWS
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
 
+# LFS:Google
+GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
+
 ## Uploads
 GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_INSTALL_DIR/public}"
 GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}"
@@ -137,14 +160,22 @@ GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_UPLOADS_OBJECT_STORE_REMOT
 GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD:-false}
 GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
 GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD:-false}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
+
+# Uploads:AWS
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
 
+# Uploads:Google
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
+
+
 ## Mattermost
 GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false}
 GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 53e063c18..08d3a5090 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -962,6 +962,20 @@ gitlab_configure_ci() {
 gitlab_configure_artifacts() {
   if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::artifacts:object_store"
+
+    if [[ "${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then
+        echo " -> Google ARTIFACTS provider selected removing aws config"
+        exec_as_git sed -i "/#start-artifacts-aws/,/#end-artifacts-aws/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#start-artifacts-gcs/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#end-artifacts-gcs/d" ${GITLAB_CONFIG}
+    fi
+    if [[ "${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then
+      echo " -> AWS ARTIFACTS provider selected removing Google config"
+      exec_as_git sed -i "/#start-artifacts-gcs/,/#end-artifacts-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-artifacts-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-artifacts-aws/d" ${GITLAB_CONFIG}
+    fi
+
     update_template ${GITLAB_CONFIG} \
       GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \
       GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
@@ -974,9 +988,12 @@ gitlab_configure_artifacts() {
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
   else
-   exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
+    exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
   fi
 
   echo "Configuring gitlab::artifacts..."
@@ -988,6 +1005,20 @@ gitlab_configure_artifacts() {
 gitlab_configure_lfs() {
   if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::lfs:object_store"
+
+    if [[ "${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then
+      echo " -> Google LFS provider selected removing aws config"
+      exec_as_git sed -i "/#start-lfs-aws/,/#end-lfs-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-lfs-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-lfs-gcs/d" ${GITLAB_CONFIG}
+    fi
+    if [[ "${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then
+      echo " -> AWS LFS provider selected removing Google config"
+      exec_as_git sed -i "/#start-lfs-gcs/,/#end-lfs-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-lfs-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-lfs-aws/d" ${GITLAB_CONFIG}
+    fi
+
     update_template ${GITLAB_CONFIG} \
       GITLAB_LFS_OBJECT_STORE_ENABLED \
       GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \
@@ -1000,9 +1031,12 @@ gitlab_configure_lfs() {
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
   else
-    exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
+    exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
   fi
 
   echo "Configuring gitlab::lfs..."
@@ -1014,6 +1048,20 @@ gitlab_configure_lfs() {
 gitlab_configure_uploads() {
   if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::uploads:object_store"
+
+    if [[ "${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then
+      echo " -> Google UPLOADS provider selected removing aws config"
+      exec_as_git sed -i "/#start-uploads-aws/,/#end-uploads-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-uploads-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-uploads-gcs/d" ${GITLAB_CONFIG}
+    fi
+    if [[ "${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then
+      echo " -> AWS UPLOADS provider selected removing Google config"
+      exec_as_git sed -i "/#start-uploads-gcs/,/#end-uploads-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-uploads-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-uploads-aws/d" ${GITLAB_CONFIG}
+    fi
+
     update_template ${GITLAB_CONFIG} \
       GITLAB_UPLOADS_OBJECT_STORE_ENABLED \
       GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \
@@ -1026,9 +1074,13 @@ gitlab_configure_uploads() {
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
-      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
+
   else
-   exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
+    exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}"  ${GITLAB_CONFIG}
   fi
 
   echo "Configuring gitlab::uploads..."

From 99feb6f083925df55b38c8c993ffc17238acc7b9 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Tue, 5 Mar 2019 09:43:45 +0300
Subject: [PATCH 0190/1124] Upgrade GitLab CE to 11.8.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 659f5e28c..5dac885b9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.8.1**
+- gitlab: upgrade CE to v11.8.1
+
 **11.8.0**
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
diff --git a/Dockerfile b/Dockerfile
index 132aa5e9b..59028c072 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.8.0
+ARG VERSION=11.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 465f01f08..7f1d62877 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.8.0
+# sameersbn/gitlab:11.8.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.8.0
+docker pull sameersbn/gitlab:11.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.8.0
+ sameersbn/gitlab:11.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.8.0
+    sameersbn/gitlab:11.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:sanitize
+    sameersbn/gitlab:11.8.1 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1216,14 +1216,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake db:setup
+    sameersbn/gitlab:11.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1232,7 +1232,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1281,7 +1281,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1294,7 +1294,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1325,7 +1325,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1347,12 +1347,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.0
+docker pull sameersbn/gitlab:11.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1378,7 +1378,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 897063bb3..4775ed639 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.8.0
+11.8.1
diff --git a/docker-compose.yml b/docker-compose.yml
index dae4b9b69..539bd116d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.8.0
+    image: sameersbn/gitlab:11.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ce8e07e2d..4c1626fde 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.0
+docker pull sameersbn/gitlab:11.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.8.0
+sameersbn/gitlab:11.8.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 22d5fe0b7..0b668451a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.8.0
+        image: sameersbn/gitlab:11.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From dfadf9a8127744fe0db1108958033276b3834e4b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 6 Mar 2019 07:22:32 +0100
Subject: [PATCH 0191/1124] Update base-image to ubuntu:20190122

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

diff --git a/Dockerfile b/Dockerfile
index 59028c072..01eae1707 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20181218
+FROM ubuntu:xenial-20190122
 
 ARG BUILD_DATE
 ARG VCS_REF

From b84f7f2ef7bd068d394839c7f0dd63d4e28c2086 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 6 Mar 2019 07:28:25 +0100
Subject: [PATCH 0192/1124] release 11.8.1


From 7b58c08b78ece2ba84d96de4d57b44da72024532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Jeli=C4=87?= <djelic@buksna.net>
Date: Wed, 6 Mar 2019 13:01:56 +0100
Subject: [PATCH 0193/1124] Fix configuration parameter list in README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 7f1d62877..13269f3be 100644
--- a/README.md
+++ b/README.md
@@ -920,7 +920,6 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-
 | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
 | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
 | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |

From fb64920e6bc8477068380272c59609820042fe62 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 15 Mar 2019 15:18:03 +0300
Subject: [PATCH 0194/1124] Upgrade GitLab CE to 11.8.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5dac885b9..862f86e2f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.8.2**
+- gitlab: upgrade CE to v11.8.2
+
 **11.8.1**
 - gitlab: upgrade CE to v11.8.1
 
diff --git a/Dockerfile b/Dockerfile
index 01eae1707..50cd36f67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190122
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.8.1
+ARG VERSION=11.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 13269f3be..c15c6ad3e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.8.1
+# sameersbn/gitlab:11.8.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.8.1
+docker pull sameersbn/gitlab:11.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.8.1
+ sameersbn/gitlab:11.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.8.1
+    sameersbn/gitlab:11.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:sanitize
+    sameersbn/gitlab:11.8.2 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake db:setup
+    sameersbn/gitlab:11.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.1
+docker pull sameersbn/gitlab:11.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4775ed639..95da6166f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.8.1
+11.8.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 539bd116d..62eed9282 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.8.1
+    image: sameersbn/gitlab:11.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4c1626fde..061a6aa49 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.1
+docker pull sameersbn/gitlab:11.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.8.1
+sameersbn/gitlab:11.8.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0b668451a..a0dc3cd8d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.8.1
+        image: sameersbn/gitlab:11.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 6a3cb6ae44fd183cc29080fb9180d22a266a9cea Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 16 Mar 2019 10:58:22 +0100
Subject: [PATCH 0195/1124] release 11.8.2


From 1f80e9f429b22fd1f1b471d44aaaf4355336d1ae Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Thu, 21 Mar 2019 10:47:07 +0300
Subject: [PATCH 0196/1124] Upgrade GitLab CE to 11.8.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 862f86e2f..ffc2d126f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.8.3**
+- gitlab: upgrade CE to v11.8.3
+
 **11.8.2**
 - gitlab: upgrade CE to v11.8.2
 
diff --git a/Dockerfile b/Dockerfile
index 50cd36f67..ced8d1177 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190122
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.8.2
+ARG VERSION=11.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index c15c6ad3e..528465738 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.8.2
+# sameersbn/gitlab:11.8.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.8.2
+docker pull sameersbn/gitlab:11.8.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.8.2
+ sameersbn/gitlab:11.8.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.8.2
+    sameersbn/gitlab:11.8.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:sanitize
+    sameersbn/gitlab:11.8.3 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake db:setup
+    sameersbn/gitlab:11.8.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.8.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.2
+docker pull sameersbn/gitlab:11.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 95da6166f..6cf2801b8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.8.2
+11.8.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 62eed9282..581a5516c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.8.2
+    image: sameersbn/gitlab:11.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 061a6aa49..442ee42f7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.2
+docker pull sameersbn/gitlab:11.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.8.2
+sameersbn/gitlab:11.8.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a0dc3cd8d..811386f90 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.8.2
+        image: sameersbn/gitlab:11.8.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 8b488579c1d71dab6d7c15e30d0f6912d81e8189 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 08:21:24 +0100
Subject: [PATCH 0197/1124] Update base-image to 20190222

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ced8d1177..f54f0976d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20190122
+FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF

From a223855f53c9db86a4e201b41669b3fda92f354a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 08:21:34 +0100
Subject: [PATCH 0198/1124] update golang to 1.11.6

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f54f0976d..560cce598 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=11.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
-    GOLANG_VERSION=1.11.4 \
+    GOLANG_VERSION=1.11.6 \
     GITLAB_SHELL_VERSION=8.4.4 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.5.0 \

From 22a910171a5c36c73bac1e28354d14782de24da6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 09:02:32 +0100
Subject: [PATCH 0199/1124] release 11.8.3


From 6cd2a114ddffaeffb06524ef0ebe3cbf702aabc9 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 09:11:16 +0100
Subject: [PATCH 0200/1124] Upgrade GitLab CE to 11.9.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ffc2d126f..1d089630a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.0**
+- gitlab: upgrade CE to v11.9.0
+
 **11.8.3**
 - gitlab: upgrade CE to v11.8.3
 
diff --git a/Dockerfile b/Dockerfile
index 560cce598..4c8624263 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.8.3
+ARG VERSION=11.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 528465738..91b25a96b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.8.3
+# sameersbn/gitlab:11.9.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.8.3
+docker pull sameersbn/gitlab:11.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.8.3
+ sameersbn/gitlab:11.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.8.3
+    sameersbn/gitlab:11.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:sanitize
+    sameersbn/gitlab:11.9.0 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake db:setup
+    sameersbn/gitlab:11.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.3
+docker pull sameersbn/gitlab:11.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 6cf2801b8..ba9aff72c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.8.3
+11.9.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 581a5516c..40c6ced2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.8.3
+    image: sameersbn/gitlab:11.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 442ee42f7..3734c0feb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.8.3
+docker pull sameersbn/gitlab:11.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.8.3
+sameersbn/gitlab:11.9.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 811386f90..856b953e5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.8.3
+        image: sameersbn/gitlab:11.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 0f970c8efa332c3c7d59f5a2c3f6aa73d1214c50 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 09:11:25 +0100
Subject: [PATCH 0201/1124] Update gitlab-shell to 8.7.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4c8624263..1134c0861 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=11.9.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.6 \
-    GITLAB_SHELL_VERSION=8.4.4 \
+    GITLAB_SHELL_VERSION=8.7.1 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.20.0 \

From c20acf2e4e7454fbb064b6feab7cbb7d5127d4af Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 23 Mar 2019 09:11:26 +0100
Subject: [PATCH 0202/1124] Update gitaly to 1.27.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1134c0861..25e353fa6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.7.1 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.20.0 \
+    GITALY_SERVER_VERSION=1.27.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 72b6d5ac7d3dc98b4b0bf1dda47ebec01c3b0b66 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 2 Apr 2019 21:06:33 +0200
Subject: [PATCH 0203/1124] release 11.9.0


From 4c785877f65da063b0384968f9e15b5605e32f72 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Tue, 26 Mar 2019 10:54:29 +0300
Subject: [PATCH 0204/1124] Upgrade GitLab CE to 11.9.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1d089630a..4fac0d98d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.1**
+- gitlab: upgrade CE to v11.9.1
+
 **11.9.0**
 - gitlab: upgrade CE to v11.9.0
 
diff --git a/Dockerfile b/Dockerfile
index 25e353fa6..ce30dfb21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.0
+ARG VERSION=11.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 91b25a96b..2af6e9207 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.0
+# sameersbn/gitlab:11.9.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.0
+docker pull sameersbn/gitlab:11.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.0
+ sameersbn/gitlab:11.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.0
+    sameersbn/gitlab:11.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:sanitize
+    sameersbn/gitlab:11.9.1 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake db:setup
+    sameersbn/gitlab:11.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.0
+docker pull sameersbn/gitlab:11.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ba9aff72c..03a7c8d30 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.0
+11.9.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 40c6ced2c..283d77853 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.0
+    image: sameersbn/gitlab:11.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3734c0feb..b9c864a50 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.0
+docker pull sameersbn/gitlab:11.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.0
+sameersbn/gitlab:11.9.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 856b953e5..959e9c3f2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.0
+        image: sameersbn/gitlab:11.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 861cb5d842baecb18709d6cf9aebfe0ce61eaacc Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 1 Apr 2019 23:41:50 +0300
Subject: [PATCH 0205/1124] Update gitaly to 1.27.1

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 4fac0d98d..32b485834 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.9.1**
 - gitlab: upgrade CE to v11.9.1
+- Update gitaly to 1.27.1
 
 **11.9.0**
 - gitlab: upgrade CE to v11.9.0
diff --git a/Dockerfile b/Dockerfile
index ce30dfb21..16b8785bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=8.7.1 \
     GITLAB_WORKHORSE_VERSION=8.3.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.27.0 \
+    GITALY_SERVER_VERSION=1.27.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From b66197fefe6a43596d73fa9778ba3017ef234191 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 2 Apr 2019 21:53:53 +0200
Subject: [PATCH 0206/1124] release 11.9.1


From dcb91a659d4d2af0c455ac554a830a8644056530 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 1 Apr 2019 23:43:33 +0300
Subject: [PATCH 0207/1124] Upgrade GitLab CE to 11.9.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 32b485834..c8209d95a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.4**
+- gitlab: upgrade CE to v11.9.4
+
 **11.9.1**
 - gitlab: upgrade CE to v11.9.1
 - Update gitaly to 1.27.1
diff --git a/Dockerfile b/Dockerfile
index 16b8785bd..f31938cba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.1
+ARG VERSION=11.9.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 2af6e9207..8edaf144d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.1
+# sameersbn/gitlab:11.9.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.1
+docker pull sameersbn/gitlab:11.9.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.1
+ sameersbn/gitlab:11.9.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.1
+    sameersbn/gitlab:11.9.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:sanitize
+    sameersbn/gitlab:11.9.4 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake db:setup
+    sameersbn/gitlab:11.9.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.1
+docker pull sameersbn/gitlab:11.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 03a7c8d30..ead8ba092 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.1
+11.9.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 283d77853..3c89ca55b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.1
+    image: sameersbn/gitlab:11.9.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b9c864a50..5a47a72fc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.1
+docker pull sameersbn/gitlab:11.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.1
+sameersbn/gitlab:11.9.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 959e9c3f2..c9e0095eb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.1
+        image: sameersbn/gitlab:11.9.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 100a9f8adbb6105a79d342777b3cfce587c0e8a5 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 1 Apr 2019 23:44:04 +0300
Subject: [PATCH 0208/1124] Update gitlab-workhorse to 8.3.3

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c8209d95a..2455595f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.9.4**
 - gitlab: upgrade CE to v11.9.4
+- Update gitlab-workhorse to 8.3.3
 
 **11.9.1**
 - gitlab: upgrade CE to v11.9.1
diff --git a/Dockerfile b/Dockerfile
index f31938cba..23f1ea85f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.6 \
     GITLAB_SHELL_VERSION=8.7.1 \
-    GITLAB_WORKHORSE_VERSION=8.3.1 \
+    GITLAB_WORKHORSE_VERSION=8.3.3 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.27.1 \
     GITLAB_USER="git" \

From 48dceec1c5a7a9bbb6c090b0d5fdc9816d073c6b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 4 Apr 2019 08:19:07 +0200
Subject: [PATCH 0209/1124] release 11.9.4


From d2e5d0a7ed2ef4c119bebf4fd71887c7cbabba9e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 4 Apr 2019 08:25:01 +0200
Subject: [PATCH 0210/1124] Upgrade GitLab CE to 11.9.5

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2455595f9..f8fb37017 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.5**
+- gitlab: upgrade CE to v11.9.5
+
 **11.9.4**
 - gitlab: upgrade CE to v11.9.4
 - Update gitlab-workhorse to 8.3.3
diff --git a/Dockerfile b/Dockerfile
index 23f1ea85f..09c53219e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.4
+ARG VERSION=11.9.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 8edaf144d..2e900e68d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.4
+# sameersbn/gitlab:11.9.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.4
+docker pull sameersbn/gitlab:11.9.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.4
+ sameersbn/gitlab:11.9.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.4
+    sameersbn/gitlab:11.9.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:sanitize
+    sameersbn/gitlab:11.9.5 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake db:setup
+    sameersbn/gitlab:11.9.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.4
+docker pull sameersbn/gitlab:11.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ead8ba092..739d93870 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.4
+11.9.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c89ca55b..bf94a2b9f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.4
+    image: sameersbn/gitlab:11.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5a47a72fc..f55a1646b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.4
+docker pull sameersbn/gitlab:11.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.4
+sameersbn/gitlab:11.9.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c9e0095eb..9667f2cd1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.4
+        image: sameersbn/gitlab:11.9.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 6bd475ce294ab45c8cb522b362237840327cbb32 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 4 Apr 2019 10:35:34 +0200
Subject: [PATCH 0211/1124] release 11.9.5


From dbefa57ba26c991f7db3598b565162c60c09bd4a Mon Sep 17 00:00:00 2001
From: David Rubin <david@unumotors.com>
Date: Sat, 6 Apr 2019 17:39:06 +0200
Subject: [PATCH 0212/1124] Upgrade gitlab to 11.9.6

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f8fb37017..3b30e3bed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.6**
+- gitlab: upgrade CE to v11.9.6
+
 **11.9.5**
 - gitlab: upgrade CE to v11.9.5
 
diff --git a/Dockerfile b/Dockerfile
index 09c53219e..6368bfe09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.5
+ARG VERSION=11.9.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 2e900e68d..0938b4ac6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.5
+# sameersbn/gitlab:11.9.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.5
+docker pull sameersbn/gitlab:11.9.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.5
+ sameersbn/gitlab:11.9.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.5
+    sameersbn/gitlab:11.9.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:sanitize
+    sameersbn/gitlab:11.9.6 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake db:setup
+    sameersbn/gitlab:11.9.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.5
+docker pull sameersbn/gitlab:11.9.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 739d93870..e5416e498 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.5
+11.9.6
diff --git a/docker-compose.yml b/docker-compose.yml
index bf94a2b9f..1fa65e11f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.5
+    image: sameersbn/gitlab:11.9.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f55a1646b..8076c11a2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.5
+docker pull sameersbn/gitlab:11.9.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.5
+sameersbn/gitlab:11.9.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9667f2cd1..feec8d797 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.5
+        image: sameersbn/gitlab:11.9.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 508e1e0ed38e7ca5ab3f3e0f80b01524a813f209 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 17 Apr 2019 19:47:55 +0200
Subject: [PATCH 0213/1124] release 11.9.6


From 180a1e81f089b8da35ca51809840568231518832 Mon Sep 17 00:00:00 2001
From: David Rubin <david@unumotors.com>
Date: Wed, 10 Apr 2019 23:02:22 +0200
Subject: [PATCH 0214/1124] Upgrade to gitlab 11.9.7

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3b30e3bed..a14dd9219 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.7**
+- gitlab: upgrade CE to v11.9.7
+
 **11.9.6**
 - gitlab: upgrade CE to v11.9.6
 
diff --git a/Dockerfile b/Dockerfile
index 6368bfe09..f980fc917 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.6
+ARG VERSION=11.9.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 0938b4ac6..3657eadb0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.6
+# sameersbn/gitlab:11.9.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.6
+docker pull sameersbn/gitlab:11.9.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.6
+ sameersbn/gitlab:11.9.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.6
+    sameersbn/gitlab:11.9.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:sanitize
+    sameersbn/gitlab:11.9.7 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake db:setup
+    sameersbn/gitlab:11.9.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.6
+docker pull sameersbn/gitlab:11.9.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.7
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e5416e498..2f9c58434 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.6
+11.9.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 1fa65e11f..a4e3b78b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.6
+    image: sameersbn/gitlab:11.9.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8076c11a2..338fa6403 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.6
+docker pull sameersbn/gitlab:11.9.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.6
+sameersbn/gitlab:11.9.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index feec8d797..eaa0fa7bb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.6
+        image: sameersbn/gitlab:11.9.7
         env:
         - name: TZ
           value: Asia/Kolkata

From 676f7ffd494ee8f18ea27c34fd0826a5b168000a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 17 Apr 2019 19:50:52 +0200
Subject: [PATCH 0215/1124] release 11.9.7


From 79f84308f6d740a6cf1b4918a262cdbee6aef8a7 Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Sun, 14 Apr 2019 11:52:36 +0900
Subject: [PATCH 0216/1124] Fix `gitlab:assets:compile` task for relative URL
 root setups

This makes container startup/upgrades use the same `NODE_OPTIONS` as
the Docker image build process.

Fixes #1896
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 08d3a5090..ab3e02d8d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1786,7 +1786,7 @@ migrate_database() {
     # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used
     if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
       echo "Recompiling assets (relative_url in use), this could take a while..."
-      exec_as_git bundle exec rake gitlab:assets:compile >/dev/null 2>&1
+      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
     fi
 
     echo "Clearing cache..."

From a96ecdfa05b115cf36034d49cd369dee90d78686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9g=C3=A9?=
 <frederic.pege@gmail.com>
Date: Mon, 15 Apr 2019 15:59:33 +0200
Subject: [PATCH 0217/1124] add libimage-exiftool-perl (needed to upload group
 avatar & sanitize tasks)

https://docs.gitlab.com/ee/administration/raketasks/uploads/sanitize.html
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f980fc917..9044c9fa5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update \
       git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \
       libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm3 libreadline6 libncurses5 libffi6 \
-      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip \
+      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \

From f65f64006eeb875518d046a8e3b40ac755df5034 Mon Sep 17 00:00:00 2001
From: David Rubin <david@unumotors.com>
Date: Sat, 13 Apr 2019 15:14:56 +0200
Subject: [PATCH 0218/1124] Upgrade to gitlab 11.9.8

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a14dd9219..1a8f2d49d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.9.8**
+- gitlab: upgrade CE to v11.9.8
+
 **11.9.7**
 - gitlab: upgrade CE to v11.9.7
 
diff --git a/Dockerfile b/Dockerfile
index 9044c9fa5..542d6e03d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.7
+ARG VERSION=11.9.8
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 3657eadb0..5302bfd8d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.7
+# sameersbn/gitlab:11.9.8
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.7
+docker pull sameersbn/gitlab:11.9.8
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.7
+ sameersbn/gitlab:11.9.8
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.7
+    sameersbn/gitlab:11.9.8
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:sanitize
+    sameersbn/gitlab:11.9.8 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake db:setup
+    sameersbn/gitlab:11.9.8 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:env:info
+    sameersbn/gitlab:11.9.8 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.9.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.7
+docker pull sameersbn/gitlab:11.9.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.8
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 2f9c58434..76d3a6cfe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.7
+11.9.8
diff --git a/docker-compose.yml b/docker-compose.yml
index a4e3b78b1..9e642a522 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.7
+    image: sameersbn/gitlab:11.9.8
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 338fa6403..bc95b8567 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.7
+docker pull sameersbn/gitlab:11.9.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.7
+sameersbn/gitlab:11.9.8
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index eaa0fa7bb..f054de114 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.7
+        image: sameersbn/gitlab:11.9.8
         env:
         - name: TZ
           value: Asia/Kolkata

From 1f048d144e0b2fbd218203d86ad460b573a9df20 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 17 Apr 2019 20:19:55 +0200
Subject: [PATCH 0219/1124] release 11.9.8


From ad8b54bdb9616df3a3918b42438419ebaaafddf3 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Sun, 21 Apr 2019 20:08:39 +0200
Subject: [PATCH 0220/1124] Prefer CI_REGISTRY_PASSWORD over CI_REGISTRY_PASS

---
 .gitlab-ci.yml  |  4 ++--
 CONTRIBUTING.md | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 675b0495c..b3e190bd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ before_script:
   - export VERSION=$(cat VERSION)
   - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com}
   - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token}
-  - export CI_REGISTRY_PASS=${CI_REGISTRY_PASS:-${CI_JOB_TOKEN}}
+  - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASS:-${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}}
   - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}}
   - |
     if [ "${DOCKER_IMAGE}" = "/" ]; then
@@ -19,7 +19,7 @@ docker:build:
   only:
     - master
   script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker build
       --pull
       --cache-from=${DOCKER_IMAGE}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6f3fc40e..d180caaba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,9 +4,10 @@ When using your own gitlab instance, the provided .gitlab-ci.yml will be automat
 
 Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
 
-| Variable           | Default Value      | Description                                                                                                                                                                                                              |
-| ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `CI_REGISTRY`      | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
-| `CI_REGISTRY_USER` | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
-| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
-| `DOCKER_IMAGE`     | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |
+| Variable               | Default Value      | Description                                                                                                                                                                                                              |
+| ---------------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `CI_REGISTRY`          | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
+| `CI_REGISTRY_USER`     | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
+| `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
+| `CI_REGISTRY_PASS`     | `${CI_JOB_TOKEN}`  | DEPRECATED: Use `CI_REGISTRY_PASSWORD`                                                                                                                                                                                   |
+| `DOCKER_IMAGE`         | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |

From 97719e1de503296fc9f3ca3bb607478c1e9e2697 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 20 Apr 2019 09:38:59 +0200
Subject: [PATCH 0221/1124] Upgrade GitLab CE to 11.10.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1a8f2d49d..156d19326 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.10.0**
+- gitlab: upgrade CE to v11.10.0
+
 **11.9.8**
 - gitlab: upgrade CE to v11.9.8
 
diff --git a/Dockerfile b/Dockerfile
index 542d6e03d..7838169a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.9.8
+ARG VERSION=11.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 5302bfd8d..42da88f2b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.9.8
+# sameersbn/gitlab:11.10.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.9.8
+docker pull sameersbn/gitlab:11.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.9.8
+ sameersbn/gitlab:11.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.9.8
+    sameersbn/gitlab:11.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:sanitize
+    sameersbn/gitlab:11.10.0 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake db:setup
+    sameersbn/gitlab:11.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:env:info
+    sameersbn/gitlab:11.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.9.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.8
+docker pull sameersbn/gitlab:11.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.8
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 76d3a6cfe..933dbb1df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.9.8
+11.10.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e642a522..52a233c21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.9.8
+    image: sameersbn/gitlab:11.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bc95b8567..22df3d24b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.9.8
+docker pull sameersbn/gitlab:11.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.9.8
+sameersbn/gitlab:11.10.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f054de114..ec7d62e61 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.9.8
+        image: sameersbn/gitlab:11.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From baaaf59d020b939acd2f15e085744f8ef980b529 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 20 Apr 2019 09:39:22 +0200
Subject: [PATCH 0222/1124] Update gitlab-shell to 9.0.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7838169a2..6682def10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=11.10.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.6 \
-    GITLAB_SHELL_VERSION=8.7.1 \
+    GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.3.3 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.27.1 \

From a15350ffdd2d424b3a28e39b4b55f762006d6181 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 20 Apr 2019 09:39:22 +0200
Subject: [PATCH 0223/1124] Update gitlab-workhorse to 8.5.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6682def10..d9dc5bc9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.6 \
     GITLAB_SHELL_VERSION=9.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.3.3 \
+    GITLAB_WORKHORSE_VERSION=8.5.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.27.1 \
     GITLAB_USER="git" \

From 257a71f1f923c89f745c78cf76341ade8f98d84f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 20 Apr 2019 09:39:22 +0200
Subject: [PATCH 0224/1124] Update gitaly to 1.33.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d9dc5bc9d..13b037800 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.5.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.27.1 \
+    GITALY_SERVER_VERSION=1.33.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 5ff5765a87786c47d309d011f9adcce45081b575 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 22 Apr 2019 19:18:48 +0200
Subject: [PATCH 0225/1124] release 11.10.0


From c66b785fcc070cc49516e5ff279061a161ae9c59 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 23 Apr 2019 20:44:35 +0200
Subject: [PATCH 0226/1124] Upgrade GitLab CE to 11.10.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 156d19326..f1f708453 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.10.1**
+- gitlab: upgrade CE to v11.10.1
+
 **11.10.0**
 - gitlab: upgrade CE to v11.10.0
 
diff --git a/Dockerfile b/Dockerfile
index 13b037800..8360b2187 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.10.0
+ARG VERSION=11.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 42da88f2b..e63644b4c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.10.0
+# sameersbn/gitlab:11.10.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.10.0
+docker pull sameersbn/gitlab:11.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.10.0
+ sameersbn/gitlab:11.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.10.0
+    sameersbn/gitlab:11.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:sanitize
+    sameersbn/gitlab:11.10.1 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake db:setup
+    sameersbn/gitlab:11.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.0
+docker pull sameersbn/gitlab:11.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 933dbb1df..46577f54f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.10.0
+11.10.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 52a233c21..c845b3a3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.10.0
+    image: sameersbn/gitlab:11.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 22df3d24b..ab529bce0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.0
+docker pull sameersbn/gitlab:11.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.10.0
+sameersbn/gitlab:11.10.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ec7d62e61..fd3716c47 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.10.0
+        image: sameersbn/gitlab:11.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 915df34f0ec1b5b3ff598293b4d16a4af15b27f8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 23 Apr 2019 20:44:48 +0200
Subject: [PATCH 0227/1124] Update gitaly to 1.34.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8360b2187..0ee0feeec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.5.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.33.0 \
+    GITALY_SERVER_VERSION=1.34.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 052ae0a2dff6e48cb21edddb34cee25a8e7c73af Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 23 Apr 2019 21:12:16 +0200
Subject: [PATCH 0228/1124] release 11.10.1


From 4b2dd9368ba7f62f1f5449e4f86bc3d0dc32e4d0 Mon Sep 17 00:00:00 2001
From: Dominic Dey-Marckmann <Kiina@users.noreply.github.com>
Date: Mon, 29 Apr 2019 21:13:03 +0200
Subject: [PATCH 0229/1124] Upgrade GitLab CE to 11.10.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f1f708453..4ccbbf303 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.10.2**
+- gitlab: upgrade CE to v11.10.2
+
 **11.10.1**
 - gitlab: upgrade CE to v11.10.1
 
diff --git a/Dockerfile b/Dockerfile
index 0ee0feeec..a6b3b6d77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.10.1
+ARG VERSION=11.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index e63644b4c..4f40fc3e2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.10.1
+# sameersbn/gitlab:11.10.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.10.1
+docker pull sameersbn/gitlab:11.10.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.10.1
+ sameersbn/gitlab:11.10.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.10.1
+    sameersbn/gitlab:11.10.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:sanitize
+    sameersbn/gitlab:11.10.2 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake db:setup
+    sameersbn/gitlab:11.10.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.10.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.1
+docker pull sameersbn/gitlab:11.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 46577f54f..bd0f144b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.10.1
+11.10.2
diff --git a/docker-compose.yml b/docker-compose.yml
index c845b3a3b..49803ad6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.10.1
+    image: sameersbn/gitlab:11.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ab529bce0..ca6375d16 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.1
+docker pull sameersbn/gitlab:11.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.10.1
+sameersbn/gitlab:11.10.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fd3716c47..4337974f9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.10.1
+        image: sameersbn/gitlab:11.10.2
         env:
         - name: TZ
           value: Asia/Kolkata

From d92260eb20e8f777a85ea2e1eebc5aa4395053aa Mon Sep 17 00:00:00 2001
From: Dominic Dey-Marckmann <Kiina@users.noreply.github.com>
Date: Mon, 29 Apr 2019 21:13:15 +0200
Subject: [PATCH 0230/1124] Update gitaly to 1.34.1

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

diff --git a/Dockerfile b/Dockerfile
index a6b3b6d77..4b734de45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.5.1 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.34.0 \
+    GITALY_SERVER_VERSION=1.34.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 6d174c42333768c855c2db786d9c29c0d59e55bc Mon Sep 17 00:00:00 2001
From: Kiina <Kiina@users.noreply.github.com>
Date: Tue, 30 Apr 2019 16:06:32 +0200
Subject: [PATCH 0231/1124] Update go to 1.11.9

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

diff --git a/Dockerfile b/Dockerfile
index 4b734de45..2204f5c93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=11.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
-    GOLANG_VERSION=1.11.6 \
+    GOLANG_VERSION=1.11.9 \
     GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.5.1 \
     GITLAB_PAGES_VERSION=1.5.0 \

From 1d42a1dae9b99848b94ae2458a520b0cc5223448 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 May 2019 21:04:00 +0200
Subject: [PATCH 0232/1124] release 11.10.2


From 1006c32fe20aa56c5b459279d4dd57eebf3168be Mon Sep 17 00:00:00 2001
From: Dominic Dey-Marckmann <Kiina@users.noreply.github.com>
Date: Wed, 1 May 2019 18:23:19 +0200
Subject: [PATCH 0233/1124] Upgrade GitLab CE to 11.10.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4ccbbf303..69180f2c8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.10.3**
+- gitlab: upgrade CE to v11.10.3
+
 **11.10.2**
 - gitlab: upgrade CE to v11.10.2
 
diff --git a/Dockerfile b/Dockerfile
index 2204f5c93..246e59646 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.10.2
+ARG VERSION=11.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 4f40fc3e2..7920c879a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.10.2
+# sameersbn/gitlab:11.10.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.10.2
+docker pull sameersbn/gitlab:11.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.10.2
+ sameersbn/gitlab:11.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.10.2
+    sameersbn/gitlab:11.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:sanitize
+    sameersbn/gitlab:11.10.3 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake db:setup
+    sameersbn/gitlab:11.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.2
+docker pull sameersbn/gitlab:11.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index bd0f144b3..d5b7da553 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.10.2
+11.10.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 49803ad6d..48b3408e8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.10.2
+    image: sameersbn/gitlab:11.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ca6375d16..e7d940a08 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.2
+docker pull sameersbn/gitlab:11.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.10.2
+sameersbn/gitlab:11.10.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4337974f9..aa9422b45 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.10.2
+        image: sameersbn/gitlab:11.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From b8eddcb7e69bb4179842a02c81072714b4e26be6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 May 2019 21:22:30 +0200
Subject: [PATCH 0234/1124] release 11.10.3


From 0976f6e32ba55f143ea7ba933ff58305a1da119a Mon Sep 17 00:00:00 2001
From: Dominic Dey-Marckmann <Kiina@users.noreply.github.com>
Date: Wed, 1 May 2019 18:25:02 +0200
Subject: [PATCH 0235/1124] Update gitlab workhorse to 8.5.2

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

diff --git a/Dockerfile b/Dockerfile
index 246e59646..e43ad8485 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.9 \
     GITLAB_SHELL_VERSION=9.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.5.1 \
+    GITLAB_WORKHORSE_VERSION=8.5.2 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.34.1 \
     GITLAB_USER="git" \

From 03eee129b25d3306f69311135079908b0237c21f Mon Sep 17 00:00:00 2001
From: Dominic Dey-Marckmann <Kiina@users.noreply.github.com>
Date: Wed, 1 May 2019 18:26:12 +0200
Subject: [PATCH 0236/1124] Upgrade GitLab CE to 11.10.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 69180f2c8..e4eddc231 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.10.4**
+- gitlab: upgrade CE to v11.10.4
+
 **11.10.3**
 - gitlab: upgrade CE to v11.10.3
 
diff --git a/Dockerfile b/Dockerfile
index e43ad8485..3bb03b376 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.10.3
+ARG VERSION=11.10.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index 7920c879a..ad9191ccf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.10.3
+# sameersbn/gitlab:11.10.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.10.3
+docker pull sameersbn/gitlab:11.10.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.10.3
+ sameersbn/gitlab:11.10.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.10.3
+    sameersbn/gitlab:11.10.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:sanitize
+    sameersbn/gitlab:11.10.4 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake db:setup
+    sameersbn/gitlab:11.10.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:11.10.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.3
+docker pull sameersbn/gitlab:11.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index d5b7da553..d9db763c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.10.3
+11.10.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 48b3408e8..1351a5539 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.10.3
+    image: sameersbn/gitlab:11.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e7d940a08..c072a6dfe 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.3
+docker pull sameersbn/gitlab:11.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.10.3
+sameersbn/gitlab:11.10.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index aa9422b45..e5c80b9d8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.10.3
+        image: sameersbn/gitlab:11.10.4
         env:
         - name: TZ
           value: Asia/Kolkata

From c5b1a28045eef4e68810c877cebc9d73128ca064 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 May 2019 21:24:03 +0200
Subject: [PATCH 0237/1124] release 11.10.4


From 56aa82d412662a7fe42464f92d14466f5bcae68d Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 27 May 2019 17:09:35 +0300
Subject: [PATCH 0238/1124] Upgrade GitLab CE to 11.11.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4eddc231..c54615fc6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.11.0**
+- gitlab: upgrade CE to v11.11.0
+
 **11.10.4**
 - gitlab: upgrade CE to v11.10.4
 
diff --git a/Dockerfile b/Dockerfile
index 3bb03b376..11fb9f387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.10.4
+ARG VERSION=11.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index ad9191ccf..632aaba52 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.10.4
+# sameersbn/gitlab:11.11.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.10.4
+docker pull sameersbn/gitlab:11.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.10.4
+ sameersbn/gitlab:11.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.10.4
+    sameersbn/gitlab:11.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:sanitize
+    sameersbn/gitlab:11.11.0 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake db:setup
+    sameersbn/gitlab:11.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:env:info
+    sameersbn/gitlab:11.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.4
+docker pull sameersbn/gitlab:11.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index d9db763c9..4b8f58769 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.10.4
+11.11.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1351a5539..6c16aefcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.10.4
+    image: sameersbn/gitlab:11.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c072a6dfe..ba26d8c96 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.10.4
+docker pull sameersbn/gitlab:11.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.10.4
+sameersbn/gitlab:11.11.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e5c80b9d8..30e9c0f71 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.10.4
+        image: sameersbn/gitlab:11.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ebf19ef30cb153a7481e311c6728cf197e8e174f Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 27 May 2019 17:10:41 +0300
Subject: [PATCH 0239/1124] Update gitaly to 1.42.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c54615fc6..2005c93d1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **11.11.0**
 - gitlab: upgrade CE to v11.11.0
+- Update gitaly to 1.42.0
 
 **11.10.4**
 - gitlab: upgrade CE to v11.10.4
diff --git a/Dockerfile b/Dockerfile
index 11fb9f387..360f61680 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.0.0 \
     GITLAB_WORKHORSE_VERSION=8.5.2 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.34.1 \
+    GITALY_SERVER_VERSION=1.42.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 95ca4492419740a71439ba7ddf035fa6c67f083d Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 27 May 2019 17:11:51 +0300
Subject: [PATCH 0240/1124] Update gitlab-shell to 9.1.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2005c93d1..1511320c2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 **11.11.0**
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
+- Update gitlab-shell to 9.1.0
 
 **11.10.4**
 - gitlab: upgrade CE to v11.10.4
diff --git a/Dockerfile b/Dockerfile
index 360f61680..d5691db99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=11.11.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.9 \
-    GITLAB_SHELL_VERSION=9.0.0 \
+    GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.5.2 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.42.0 \

From e8ccebcc699af1e8f08638b47046c9670df2a9e1 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Mon, 27 May 2019 17:24:39 +0300
Subject: [PATCH 0241/1124] Update gitlab-workhorse to 8.7.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1511320c2..d81afff9d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
 - Update gitlab-shell to 9.1.0
+- Update gitlab-workhorse to 8.7.0
 
 **11.10.4**
 - gitlab: upgrade CE to v11.10.4
diff --git a/Dockerfile b/Dockerfile
index d5691db99..9801e9fe5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.11.9 \
     GITLAB_SHELL_VERSION=9.1.0 \
-    GITLAB_WORKHORSE_VERSION=8.5.2 \
+    GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.42.0 \
     GITLAB_USER="git" \

From 921f26d8ff888c66426fe25c9111f0f9f898a9b2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 27 May 2019 21:24:27 +0200
Subject: [PATCH 0242/1124] release 11.11.0


From 6fb00aea11387fd2c0891d3015b79fcb65c24359 Mon Sep 17 00:00:00 2001
From: KOMURA Takaaki <komura.takaaki.3v@kyoto-u.ac.jp>
Date: Wed, 29 May 2019 16:01:48 +0900
Subject: [PATCH 0243/1124] fix
 gitlab_configure_oauth_saml_attribute_statements()

OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME reflects username: in gitlab.yml
OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME is not required.
---
 assets/runtime/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index ab3e02d8d..099e7140f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -589,12 +589,12 @@ gitlab_configure_oauth_bitbucket() {
 }
 
 gitlab_configure_oauth_saml_attribute_statements() {
-  if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} && \
-        -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME} ]]; then
+  if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} ]]; then
     echo "Configuring gitlab::oauth::saml::attribute_statements..."
     update_template ${GITLAB_CONFIG} \
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL \
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME \
+      OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME \
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \
       OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME
     # Remove undefined optional attributes

From 1e3feaa967fc8103469895ad624cf17d3486d2fa Mon Sep 17 00:00:00 2001
From: David Rubin <davidrub@gmail.com>
Date: Tue, 4 Jun 2019 17:29:29 +0200
Subject: [PATCH 0244/1124] Upgrade to 11.11.1

---
 Changelog.md               |  4 +++
 Dockerfile                 |  4 +--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d81afff9d..0c063ab90 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.11.1**
+- gitlab: upgrade CE to v11.11.1
+- Update gitaly to 1.42.2
+
 **11.11.0**
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
diff --git a/Dockerfile b/Dockerfile
index 9801e9fe5..20e9b5d69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.11.0
+ARG VERSION=11.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.42.0 \
+    GITALY_SERVER_VERSION=1.42.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 632aaba52..983797f8f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.11.0
+# sameersbn/gitlab:11.11.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.11.0
+docker pull sameersbn/gitlab:11.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.11.0
+ sameersbn/gitlab:11.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.11.0
+    sameersbn/gitlab:11.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:sanitize
+    sameersbn/gitlab:11.11.1 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake db:setup
+    sameersbn/gitlab:11.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:11.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.0
+docker pull sameersbn/gitlab:11.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4b8f58769..ef772f7aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.11.0
+11.11.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c16aefcc..140493402 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.11.0
+    image: sameersbn/gitlab:11.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ba26d8c96..06d143452 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.0
+docker pull sameersbn/gitlab:11.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.11.0
+sameersbn/gitlab:11.11.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 30e9c0f71..0e3620fd6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.11.0
+        image: sameersbn/gitlab:11.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 283d6a907ce32359405ba0052f9e088f0ac4b893 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 7 Jun 2019 22:22:54 +0200
Subject: [PATCH 0245/1124] release 11.11.1


From 3da4f83fbc223c980ade05129aac458000b416a3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 7 Jun 2019 23:32:00 +0200
Subject: [PATCH 0246/1124] release 11.11.1


From 63883ab0a0bb0b1f4aba6477cf2db4eb1eb6ac01 Mon Sep 17 00:00:00 2001
From: David Rubin <davidrub@gmail.com>
Date: Fri, 7 Jun 2019 19:09:20 +0200
Subject: [PATCH 0247/1124] Upgrade to 11.11.2

---
 Changelog.md               |  4 +++
 Dockerfile                 |  4 +--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0c063ab90..21dd36ef7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.11.2**
+- gitlab: upgrade CE to v11.11.2
+- Update gitaly to 1.42.3
+
 **11.11.1**
 - gitlab: upgrade CE to v11.11.1
 - Update gitaly to 1.42.2
diff --git a/Dockerfile b/Dockerfile
index 20e9b5d69..7b0bf8872 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.11.1
+ARG VERSION=11.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.42.2 \
+    GITALY_SERVER_VERSION=1.42.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 983797f8f..3a393dd7b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.11.1
+# sameersbn/gitlab:11.11.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.11.1
+docker pull sameersbn/gitlab:11.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.11.1
+ sameersbn/gitlab:11.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.11.1
+    sameersbn/gitlab:11.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:sanitize
+    sameersbn/gitlab:11.11.2 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake db:setup
+    sameersbn/gitlab:11.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:11.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.1
+docker pull sameersbn/gitlab:11.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ef772f7aa..5866bfb27 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.11.1
+11.11.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 140493402..27c0afbc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.11.1
+    image: sameersbn/gitlab:11.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 06d143452..e5945a3a9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.1
+docker pull sameersbn/gitlab:11.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.11.1
+sameersbn/gitlab:11.11.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0e3620fd6..760e55d3c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.11.1
+        image: sameersbn/gitlab:11.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From ccd59a8a3206f42d1c085aa9ffb2b7dd796a2d37 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 7 Jun 2019 23:38:52 +0200
Subject: [PATCH 0248/1124] release 11.11.2


From 6e6add4210c16a6065fc5de9069760dbeacef12c Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Mon, 10 Jun 2019 19:25:04 +0200
Subject: [PATCH 0249/1124] upgrade gitlab-ce to 11.11.3 and gitaly to 1.42.4

---
 Changelog.md               |  4 +++
 Dockerfile                 |  4 +--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 21dd36ef7..cd9f172ff 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**11.11.3**
+- gitlab: upgrade CE to v11.11.3
+- Update gitaly to 1.42.4
+
 **11.11.2**
 - gitlab: upgrade CE to v11.11.2
 - Update gitaly to 1.42.3
diff --git a/Dockerfile b/Dockerfile
index 7b0bf8872..ac3eac863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.11.2
+ARG VERSION=11.11.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.42.3 \
+    GITALY_SERVER_VERSION=1.42.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3a393dd7b..ee22ca13b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.11.2
+# sameersbn/gitlab:11.11.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.11.2
+docker pull sameersbn/gitlab:11.11.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.11.2
+ sameersbn/gitlab:11.11.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.11.2
+    sameersbn/gitlab:11.11.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:sanitize
+    sameersbn/gitlab:11.11.3 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake db:setup
+    sameersbn/gitlab:11.11.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:11.11.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:11.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.2
+docker pull sameersbn/gitlab:11.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 5866bfb27..caf202a93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.11.2
+11.11.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 27c0afbc9..97f30d8dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.11.2
+    image: sameersbn/gitlab:11.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e5945a3a9..36b54ff61 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.2
+docker pull sameersbn/gitlab:11.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.11.2
+sameersbn/gitlab:11.11.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 760e55d3c..1b3182e77 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.11.2
+        image: sameersbn/gitlab:11.11.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 3446236fea85b02af0f49205128d7298cf96fd7f Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Mon, 10 Jun 2019 19:27:20 +0200
Subject: [PATCH 0250/1124] Update golang to 1.12.5

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index cd9f172ff..b56d44939 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
+- Update golang to 1.12.5
 
 **11.11.2**
 - gitlab: upgrade CE to v11.11.2
diff --git a/Dockerfile b/Dockerfile
index ac3eac863..a03e37424 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=11.11.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
-    GOLANG_VERSION=1.11.9 \
+    GOLANG_VERSION=1.12.5 \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \

From 8fdb620349ef577b19801127d4404616a5c823af Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Mon, 17 Jun 2019 16:06:04 +0200
Subject: [PATCH 0251/1124] update golang to 1.12.6

---
 Changelog.md | 2 +-
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b56d44939..37b89d0ed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
-- Update golang to 1.12.5
+- Update golang to 1.12.6
 
 **11.11.2**
 - gitlab: upgrade CE to v11.11.2
diff --git a/Dockerfile b/Dockerfile
index a03e37424..5a44628f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=11.11.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
-    GOLANG_VERSION=1.12.5 \
+    GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \

From d1e15afe02b1c875a892a970a1cbd4a97d0ce1d4 Mon Sep 17 00:00:00 2001
From: Sergey Rusakov <sr@redmadrobot.com>
Date: Fri, 31 May 2019 10:05:48 +0300
Subject: [PATCH 0252/1124] Removed ipv6only option from gitlab-pages-ssl nginx
 config template

---
 assets/runtime/config/nginx/gitlab-pages-ssl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl
index 9eaa3244c..17ab05e93 100644
--- a/assets/runtime/config/nginx/gitlab-pages-ssl
+++ b/assets/runtime/config/nginx/gitlab-pages-ssl
@@ -23,7 +23,7 @@ server {
 ## Pages serving host
 server {
   listen 0.0.0.0:443 ssl;
-  listen [::]:443 ipv6only=on ssl http2;
+  listen [::]:443 ssl http2;
 
   ## Replace this with something like pages.gitlab.com
   server_name ~^.*{{GITLAB_PAGES_DOMAIN}};

From 70d36b466922dca815fbff8f3dff87e95296e14e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 17 Jun 2019 21:58:11 +0200
Subject: [PATCH 0253/1124] release 11.11.3


From 3e54c3a92acd0a0d8a449c036d1953d71a348f6d Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:27:56 +0200
Subject: [PATCH 0254/1124] Upgrade GitLab CE to 12.0.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 37b89d0ed..1289fbf46 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.0.0**
+- gitlab: upgrade CE to v12.0.0
+
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
diff --git a/Dockerfile b/Dockerfile
index 5a44628f5..55a276cec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=11.11.3
+ARG VERSION=12.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
diff --git a/README.md b/README.md
index ee22ca13b..8d53bc3cd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:11.11.3
+# sameersbn/gitlab:12.0.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:11.11.3
+docker pull sameersbn/gitlab:12.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:11.11.3
+ sameersbn/gitlab:12.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:11.11.3
+    sameersbn/gitlab:12.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:sanitize
+    sameersbn/gitlab:12.0.0 app:sanitize
 ```
 
 ### Piwik
@@ -1187,7 +1187,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1215,14 +1215,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake db:setup
+    sameersbn/gitlab:12.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:11.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.3
+docker pull sameersbn/gitlab:12.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1377,7 +1377,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index caf202a93..4044f9086 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.11.3
+12.0.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 97f30d8dd..b59bd2843 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:11.11.3
+    image: sameersbn/gitlab:12.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 36b54ff61..ff4a4b2f2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:11.11.3
+docker pull sameersbn/gitlab:12.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:11.11.3
+sameersbn/gitlab:12.0.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1b3182e77..da7e70156 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:11.11.3
+        image: sameersbn/gitlab:12.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 63203877c4b9319d7ba2ffc2a983f76e70cdff89 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:29:55 +0200
Subject: [PATCH 0255/1124] Update gitaly to 1.47.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1289fbf46..00bd0ff22 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **12.0.0**
 - gitlab: upgrade CE to v12.0.0
+- Update gitaly to 1.47.0
 
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
diff --git a/Dockerfile b/Dockerfile
index 55a276cec..497844d19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.1.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
-    GITALY_SERVER_VERSION=1.42.4 \
+    GITALY_SERVER_VERSION=1.47.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From e358c02e49d0d4fc24e77d669dedaf8af29732e9 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:31:35 +0200
Subject: [PATCH 0256/1124] Update gitlab-shell to 9.3.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 00bd0ff22..ad1c1a68f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 **12.0.0**
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
+- Update gitlab-shell to 9.3.0
 
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
diff --git a/Dockerfile b/Dockerfile
index 497844d19..23c2b7e62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=12.0.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.5 \
     GOLANG_VERSION=1.12.6 \
-    GITLAB_SHELL_VERSION=9.1.0 \
+    GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.5.0 \
     GITALY_SERVER_VERSION=1.47.0 \

From d2672dec824460b38333bf13146acefd7f168adf Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:33:11 +0200
Subject: [PATCH 0257/1124] Update gitlab-pages to 1.6.1

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ad1c1a68f..3b93d113c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
 - Update gitlab-shell to 9.3.0
+- Update gitlab-pages to 1.6.1
 
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
diff --git a/Dockerfile b/Dockerfile
index 23c2b7e62..22cac6d3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
-    GITLAB_PAGES_VERSION=1.5.0 \
+    GITLAB_PAGES_VERSION=1.6.1 \
     GITALY_SERVER_VERSION=1.47.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From d9276e8cd7a43bed6dcd28e7d3ce6007de6d68fa Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:34:39 +0200
Subject: [PATCH 0258/1124] Update ruby to 2.6

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3b93d113c..d59a842f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - Update gitaly to 1.47.0
 - Update gitlab-shell to 9.3.0
 - Update gitlab-pages to 1.6.1
+- ruby: update to 2.6
 
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
diff --git a/Dockerfile b/Dockerfile
index 22cac6d3e..c22b5427e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VCS_REF
 ARG VERSION=12.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.5 \
+    RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \

From f582876f8301e1740c753dfc5641f5c4808749a3 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:36:44 +0200
Subject: [PATCH 0259/1124] Update python to 3

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index d59a842f9..53af18ebc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 - Update gitlab-shell to 9.3.0
 - Update gitlab-pages to 1.6.1
 - ruby: update to 2.6
+- python: update to 3
 
 **11.11.3**
 - gitlab: upgrade CE to v11.11.3
diff --git a/Dockerfile b/Dockerfile
index c22b5427e..e3e735263 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server mysql-client postgresql-client redis-tools \
-      git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \
+      git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \
       libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm3 libreadline6 libncurses5 libffi6 \
       libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \

From be45df494daddfb7a9991d56aa7d06a2d51c96ba Mon Sep 17 00:00:00 2001
From: Bartosz Cisek <b.cisek@edu-space.pl>
Date: Wed, 3 Jul 2019 21:43:59 +0200
Subject: [PATCH 0260/1124] Add support for AWS S3 signature version

Some 3rd party storage solutions allow upload via S3 protocol but still
use v2 of signature schema. [Fog library used by gitlab](https://docs.gitlab.com/ee/administration/uploads.html#s3-compatible-connection-settings)
allows to override default version 4.
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 1 +
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8d53bc3cd..909054ec9 100644
--- a/README.md
+++ b/README.md
@@ -1148,6 +1148,7 @@ Below is the complete list of available options that can be used to customize yo
 | `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) |
 | `AWS_BACKUP_ENCRYPTION`     | Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) |
 | `AWS_BACKUP_STORAGE_CLASS` | Configure the storage class for the item. Defaults to `STANDARD`  See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html) |
+| `AWS_BACKUP_SIGNATURE_VERSION` | Configure the storage signature version. Defaults to `4`  See at [AWS S3 Docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version) |
 | `GCS_BACKUPS` | Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`.  |
 | `GCS_BACKUP_ACCESS_KEY_ID` | GCS access key id. No defaults |
 | `GCS_BACKUP_SECRET_ACCESS_KEY` | GCS secret access key. No defaults |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 3d36a8785..775b4f150 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -606,6 +606,7 @@ production: &base
         path_style: {{AWS_BACKUP_PATH_STYLE}}
         aws_access_key_id: {{AWS_BACKUP_ACCESS_KEY_ID}}
         aws_secret_access_key: '{{AWS_BACKUP_SECRET_ACCESS_KEY}}'
+        aws_signature_version: {{AWS_BACKUP_SIGNATURE_VERSION}}
       # The remote 'directory' to store your backups. For S3, this would be the bucket name.
       remote_directory: '{{AWS_BACKUP_BUCKET}}'
       #start-multipart-aws
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 4c4318b8e..0834090da 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -239,6 +239,7 @@ AWS_BACKUP_BUCKET=${AWS_BACKUP_BUCKET}
 AWS_BACKUP_MULTIPART_CHUNK_SIZE=${AWS_BACKUP_MULTIPART_CHUNK_SIZE}
 AWS_BACKUP_ENCRYPTION=${AWS_BACKUP_ENCRYPTION}
 AWS_BACKUP_STORAGE_CLASS=${AWS_BACKUP_STORAGE_CLASS:-STANDARD}
+AWS_BACKUP_SIGNATURE_VERSION=${AWS_BACKUP_SIGNATURE_VERSION:-4}
 
 ### GCS BACKUPS
 GCS_BACKUPS=${GCS_BACKUPS:-false}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index ab3e02d8d..12a49eede 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -844,7 +844,8 @@ gitlab_configure_backups_aws() {
       AWS_BACKUP_SECRET_ACCESS_KEY \
       AWS_BACKUP_BUCKET \
       AWS_BACKUP_MULTIPART_CHUNK_SIZE \
-      AWS_BACKUP_STORAGE_CLASS
+      AWS_BACKUP_STORAGE_CLASS \
+      AWS_BACKUP_SIGNATURE_VERSION
 }
 
 gitlab_configure_backup_gcs() {

From fe04334b61f7f2b4c27804e0aedcca034efd4677 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 7 Jul 2019 18:39:58 +0200
Subject: [PATCH 0261/1124] Fix behaviour of gitlab:backup:restore/backup

Since 10.8 GitLab requires Gitaly as core process. Gitaly needs to be
run to make backups successfuly.

For this case we will start all proccess to let handle the backup and
restore correctly like before.

Signed-off-by: solidnerd <niclas@mietz.io>
---
 README.md                |  8 ++++++++
 assets/build/install.sh  | 13 +++++++++++++
 assets/runtime/functions |  9 +++++++++
 3 files changed, 30 insertions(+)

diff --git a/README.md b/README.md
index 909054ec9..4dabad844 100644
--- a/README.md
+++ b/README.md
@@ -1198,9 +1198,16 @@ A backup will be created in the backups folder of the [Data Store](#data-store).
 When using `docker-compose` you may use the following command to execute the backup.
 
 ```bash
+docker-compose rm -sf gitlab
 docker-compose run --rm gitlab app:rake gitlab:backup:create
 ```
 
+Afterwards you can bring your Instance back with the following command:
+
+```bash
+docker-compose up -d
+```
+
 ## Restoring Backups
 
 GitLab also defines a rake task to restore a backup.
@@ -1242,6 +1249,7 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b
 docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1417624827 # Choose to restore from 1417624827
 ```
 
+
 ## Host Key Backups (ssh)
 
 SSH keys are not backed up in the normal gitlab backup process. You
diff --git a/assets/build/install.sh b/assets/build/install.sh
index bcca8cdd1..ab96d6eef 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -402,6 +402,19 @@ stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
 stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
 EOF
 
+
+cat > /etc/supervisor/conf.d/groups.conf <<EOF
+[group:core]
+programs=gitaly
+priority=5
+[group:gitlab]
+programs=unicorn,gitlab-workhorse
+priority=10
+[group:gitlab_extensions]
+programs=sshd,nginx,mail_room,cron
+priority=20
+EOF
+
 # purge build dependencies and cleanup apt
 DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
 rm -rf /var/lib/apt/lists/*
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 12a49eede..6c3b42831 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1802,7 +1802,16 @@ execute_raketask() {
     return 1
   fi
 
+  if [[ ${1} == gitlab:backup:create  ]]; then
+    /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+    supervisorctl stop gitlab_extensions:*
+    supervisorctl stop gitlab:*
+  fi
+
   if [[ ${1} == gitlab:backup:restore ]]; then
+    /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+    supervisorctl stop gitlab_extensions:*
+    supervisorctl stop gitlab:*
     interactive=true
     for arg in $@
     do

From 5e981a4273f1d06dbf00e2a4e0814d35d48ba15a Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sat, 6 Jul 2019 19:38:42 +0530
Subject: [PATCH 0262/1124] updated to sameersbn/postgresql:10-2 image

---
 README.md                     | 6 +++---
 docker-compose.yml            | 2 +-
 docs/s3_compatible_storage.md | 2 +-
 kubernetes/postgresql-rc.yml  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4dabad844..1dd3841a6 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:10
+    sameersbn/postgresql:10-2
 ```
 
 Step 2. Launch a redis container
@@ -279,7 +279,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, lets pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:10
+docker pull sameersbn/postgresql:10-2
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -299,7 +299,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:10
+    sameersbn/postgresql:10-2
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
diff --git a/docker-compose.yml b/docker-compose.yml
index b59bd2843..537ee70a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:10
+    image: sameersbn/postgresql:10-2
     volumes:
     - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index d876cc7a0..046c6917d 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -80,7 +80,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:10
+    image: sameersbn/postgresql:10-2
     volumes:
     - /tmp/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index d5ce45aac..42df975a0 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:10
+        image: sameersbn/postgresql:10-2
         env:
         - name: DB_USER
           value: gitlab

From 9aab3ea2f9423ab63b86fe45499030bc04462300 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sat, 6 Jul 2019 19:39:46 +0530
Subject: [PATCH 0263/1124] updated to sameersbn/mysql:5.7.26-0 image

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1dd3841a6..d1d64119a 100644
--- a/README.md
+++ b/README.md
@@ -332,7 +332,7 @@ Assuming that your mysql data is available at `/srv/docker/gitlab/mysql`
 ```bash
 docker run --name gitlab-mysql -d \
     --volume /srv/docker/gitlab/mysql:/var/lib/mysql \
-    sameersbn/mysql:5.7.22-1
+    sameersbn/mysql:5.7.26-0
 ```
 
 This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database.
@@ -377,7 +377,7 @@ To illustrate linking with a mysql container, we will use the [sameersbn/mysql](
 First, lets pull the mysql image from the docker index.
 
 ```bash
-docker pull sameersbn/mysql:5.7.22-1
+docker pull sameersbn/mysql:5.7.26-0
 ```
 
 For data persistence lets create a store for the mysql and start the container.
@@ -396,7 +396,7 @@ docker run --name gitlab-mysql -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/mysql:/var/lib/mysql \
-    sameersbn/mysql:5.7.22-1
+    sameersbn/mysql:5.7.26-0
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database.

From 9d88a0d94e7461426624180f1a43cd9431ecd8aa Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sat, 6 Jul 2019 19:40:02 +0530
Subject: [PATCH 0264/1124] updated to sameersbn/redis:4.0.9-2 image

---
 README.md                               | 6 +++---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docker-compose.yml                      | 2 +-
 docs/docker-compose-registry.yml        | 2 +-
 docs/s3_compatible_storage.md           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d1d64119a..cb6bf6f36 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:4.0.9-1
+    sameersbn/redis:4.0.9-2
 ```
 
 Step 3. Launch the gitlab container
@@ -445,7 +445,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis](
 First, lets pull the redis image from the docker index.
 
 ```bash
-docker pull sameersbn/redis:4.0.9-1
+docker pull sameersbn/redis:4.0.9-2
 ```
 
 Lets start the redis container
@@ -453,7 +453,7 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:4.0.9-1
+    sameersbn/redis:4.0.9-2
 ```
 
 We are now ready to start the GitLab application.
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5779985d3..567e5035d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-1
+    image: sameersbn/redis:4.0.9-2
     command:
     - --loglevel warning
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 537ee70a7..ddabe5377 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-1
+    image: sameersbn/redis:4.0.9-2
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1a8ba4b66..f9fd537ca 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-1
+    image: sameersbn/redis:4.0.9-2
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 046c6917d..d640d63c8 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -72,7 +72,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-1
+    image: sameersbn/redis:4.0.9-2
     command:
     - --loglevel warning
     volumes:

From 5eadf56ba75841a0915d4256bc2ea26551fd9591 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 13 Jul 2019 14:06:28 +0200
Subject: [PATCH 0265/1124] release 12.0.0


From d15024e1f9f05396f5bd8aa330d969fad46d6e53 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 17:59:06 +0200
Subject: [PATCH 0266/1124] Upgrade GitLab CE to 12.0.1

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 53af18ebc..4d42e61e1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.0.1**
+- gitlab: upgrade CE to v12.0.1
+
 **12.0.0**
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
diff --git a/Dockerfile b/Dockerfile
index e3e735263..7f4875624 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.0.0
+ARG VERSION=12.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index cb6bf6f36..648925123 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.0.0
+# sameersbn/gitlab:12.0.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.0.0
+docker pull sameersbn/gitlab:12.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.0.0
+ sameersbn/gitlab:12.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.0.0
+    sameersbn/gitlab:12.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:sanitize
+    sameersbn/gitlab:12.0.1 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1223,14 +1223,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake db:setup
+    sameersbn/gitlab:12.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1289,7 +1289,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.0
+docker pull sameersbn/gitlab:12.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1386,7 +1386,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4044f9086..b700dc1d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.0
+12.0.1
diff --git a/docker-compose.yml b/docker-compose.yml
index ddabe5377..81944e0ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.0.0
+    image: sameersbn/gitlab:12.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ff4a4b2f2..8f3a4f6e8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.0
+docker pull sameersbn/gitlab:12.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.0.0
+sameersbn/gitlab:12.0.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index da7e70156..757a46d4d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.0.0
+        image: sameersbn/gitlab:12.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 970e0d60dff56fecae5acbdd8e3db0148c1c6a60 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 23 Jul 2019 12:02:37 +0200
Subject: [PATCH 0267/1124] release 12.0.1


From cdf4d8dd7a475a24f6fa460cf303327d5deb51b6 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 18:03:20 +0200
Subject: [PATCH 0268/1124] Upgrade GitLab CE to 12.0.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4d42e61e1..2dc66c5b1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.0.2**
+- gitlab: upgrade CE to v12.0.2
+
 **12.0.1**
 - gitlab: upgrade CE to v12.0.1
 
diff --git a/Dockerfile b/Dockerfile
index 7f4875624..068b263ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.0.1
+ARG VERSION=12.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 648925123..acb23b21b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.0.1
+# sameersbn/gitlab:12.0.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.0.1
+docker pull sameersbn/gitlab:12.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.0.1
+ sameersbn/gitlab:12.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.0.1
+    sameersbn/gitlab:12.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:sanitize
+    sameersbn/gitlab:12.0.2 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1223,14 +1223,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake db:setup
+    sameersbn/gitlab:12.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1289,7 +1289,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.1
+docker pull sameersbn/gitlab:12.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1386,7 +1386,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b700dc1d4..f36e00abc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.1
+12.0.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 81944e0ae..2da0a9b86 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.0.1
+    image: sameersbn/gitlab:12.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8f3a4f6e8..ccd138597 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.1
+docker pull sameersbn/gitlab:12.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.0.1
+sameersbn/gitlab:12.0.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 757a46d4d..c6864038b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.0.1
+        image: sameersbn/gitlab:12.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 4bc69212fadda96cf8dce263b89cdcb9650403ed Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 24 Jul 2019 12:50:44 +0200
Subject: [PATCH 0269/1124] release 12.0.2


From 33bf60d6679db824ab9975e31b3d4373887540f6 Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Sun, 7 Jul 2019 18:05:38 +0200
Subject: [PATCH 0270/1124] Upgrade GitLab CE to 12.0.3

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2dc66c5b1..6672abfbb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.0.3**
+- gitlab: upgrade CE to v12.0.3
+
 **12.0.2**
 - gitlab: upgrade CE to v12.0.2
 
diff --git a/Dockerfile b/Dockerfile
index 068b263ec..313c275bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.0.2
+ARG VERSION=12.0.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index acb23b21b..210b8de6c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.0.2
+# sameersbn/gitlab:12.0.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.0.2
+docker pull sameersbn/gitlab:12.0.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.0.2
+ sameersbn/gitlab:12.0.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.0.2
+    sameersbn/gitlab:12.0.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:sanitize
+    sameersbn/gitlab:12.0.3 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1223,14 +1223,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake db:setup
+    sameersbn/gitlab:12.0.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1289,7 +1289,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.0.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.2
+docker pull sameersbn/gitlab:12.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1386,7 +1386,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index f36e00abc..470ce40f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.2
+12.0.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 2da0a9b86..ef332da93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.0.2
+    image: sameersbn/gitlab:12.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ccd138597..60090f655 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.2
+docker pull sameersbn/gitlab:12.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.0.2
+sameersbn/gitlab:12.0.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c6864038b..ef5afe7e7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.0.2
+        image: sameersbn/gitlab:12.0.3
         env:
         - name: TZ
           value: Asia/Kolkata

From c705567a80d5b184c3a995a395497905bb436246 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 24 Jul 2019 13:29:48 +0200
Subject: [PATCH 0271/1124] release 12.0.3


From c9a85fe385f5fc5d8cd53d30b2374276f046e932 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 30 Jul 2019 07:52:12 +0200
Subject: [PATCH 0272/1124] Upgrade GitLab CE to 12.0.4

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6672abfbb..81de39004 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.0.4**
+- gitlab: upgrade CE to v12.0.4
+
 **12.0.3**
 - gitlab: upgrade CE to v12.0.3
 
diff --git a/Dockerfile b/Dockerfile
index 313c275bd..c46ce9829 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.0.3
+ARG VERSION=12.0.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 210b8de6c..121d38eeb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.0.3
+# sameersbn/gitlab:12.0.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.0.3
+docker pull sameersbn/gitlab:12.0.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.0.3
+ sameersbn/gitlab:12.0.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.0.3
+    sameersbn/gitlab:12.0.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:sanitize
+    sameersbn/gitlab:12.0.4 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1223,14 +1223,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake db:setup
+    sameersbn/gitlab:12.0.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1289,7 +1289,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.0.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.0.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.3
+docker pull sameersbn/gitlab:12.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1386,7 +1386,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 470ce40f5..f0ad79259 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.3
+12.0.4
diff --git a/docker-compose.yml b/docker-compose.yml
index ef332da93..9c2a28f44 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.0.3
+    image: sameersbn/gitlab:12.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 60090f655..d60329987 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.3
+docker pull sameersbn/gitlab:12.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.0.3
+sameersbn/gitlab:12.0.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ef5afe7e7..bf828890d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.0.3
+        image: sameersbn/gitlab:12.0.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 9ffc775ab9a77356e84e5c09eb2ee9ad3fb5443a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 11 Aug 2019 11:19:23 +0200
Subject: [PATCH 0273/1124] release 12.0.4


From 75e025ed2af723d00f11f855c89e2ee03d2ae038 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 24 Jul 2019 13:00:25 +0200
Subject: [PATCH 0274/1124] Upgrade GitLab CE to 12.1.0

---
 Changelog.md               |  3 ++
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 81de39004..227ad1ca3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.0**
+- gitlab: upgrade CE to v12.1.0
+
 **12.0.4**
 - gitlab: upgrade CE to v12.0.4
 
diff --git a/Dockerfile b/Dockerfile
index c46ce9829..7f51740fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.0.4
+ARG VERSION=12.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 121d38eeb..0be7a5ce3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.0.4
+# sameersbn/gitlab:12.1.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.0.4
+docker pull sameersbn/gitlab:12.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 ## Database
@@ -265,7 +265,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -309,7 +309,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -363,7 +363,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 #### Linking to MySQL Container
@@ -406,7 +406,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-mysql:mysql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -433,7 +433,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 ### Linking to Redis Container
@@ -460,7 +460,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 ### Mail
@@ -473,7 +473,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -493,7 +493,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -570,7 +570,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -586,7 +586,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.0.4
+ sameersbn/gitlab:12.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -609,7 +609,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -657,7 +657,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -830,14 +830,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.0.4
+    sameersbn/gitlab:12.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:sanitize
+    sameersbn/gitlab:12.1.0 app:sanitize
 ```
 
 ### Piwik
@@ -1188,7 +1188,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1223,14 +1223,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake db:setup
+    sameersbn/gitlab:12.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1289,7 +1289,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.4
+docker pull sameersbn/gitlab:12.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1386,7 +1386,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index f0ad79259..77903b35f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.0.4
+12.1.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c2a28f44..7222e10f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.0.4
+    image: sameersbn/gitlab:12.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d60329987..46088db1d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.0.4
+docker pull sameersbn/gitlab:12.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.0.4
+sameersbn/gitlab:12.1.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bf828890d..780fc5912 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.0.4
+        image: sameersbn/gitlab:12.1.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 7a82fd25ce311b0855921c035cee37cfa4e74a3c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 24 Jul 2019 13:01:06 +0200
Subject: [PATCH 0275/1124] Update gitlab-pages to 1.7.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7f51740fa..114246df3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
-    GITLAB_PAGES_VERSION=1.6.1 \
+    GITLAB_PAGES_VERSION=1.7.0 \
     GITALY_SERVER_VERSION=1.47.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 7d2116f5569872f9ccfd96e2a51d3f830abfaa25 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 24 Jul 2019 13:01:06 +0200
Subject: [PATCH 0276/1124] Update gitaly to 1.53.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 114246df3..ed42b9a3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.7.0 \
-    GITALY_SERVER_VERSION=1.47.0 \
+    GITALY_SERVER_VERSION=1.53.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 1a22748ea22f3070d8b446610e4110935400d203 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 11 Aug 2019 11:06:26 +0200
Subject: [PATCH 0277/1124] Remove MySQL Support for Versions > 12.1

---
 Changelog.md                                |   1 +
 Dockerfile                                  |   6 +-
 README.md                                   | 114 +----------------
 assets/build/install.sh                     |   6 +-
 assets/runtime/config/gitlabhq/database.yml |   4 +-
 assets/runtime/env-defaults                 |   3 +-
 assets/runtime/functions                    | 130 ++++++--------------
 7 files changed, 51 insertions(+), 213 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 227ad1ca3..601fe96cb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **12.1.0**
 - gitlab: upgrade CE to v12.1.0
+- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) 
 
 **12.0.4**
 - gitlab: upgrade CE to v12.0.4
diff --git a/Dockerfile b/Dockerfile
index ed42b9a3c..dd74bc376 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20190222
+FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -43,9 +43,9 @@ RUN apt-get update \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server mysql-client postgresql-client redis-tools \
+      nginx openssh-server postgresql-client-10 redis-tools \
       git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \
-      libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
+      libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm3 libreadline6 libncurses5 libffi6 \
       libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
diff --git a/README.md b/README.md
index 0be7a5ce3..f900f08b7 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,6 @@
         - [PostgreSQL (Recommended)](#postgresql)
             - [External PostgreSQL Server](#external-postgresql-server)
             - [Linking to PostgreSQL Container](#linking-to-postgresql-container)
-        - [MySQL](#mysql)
-            - [Internal MySQL Server](#internal-mysql-server)
-            - [External MySQL Server](#external-mysql-server)
-            - [Linking to MySQL Container](#linking-to-mysql-container)
     - [Redis](#redis)
         - [Internal Redis Server](#internal-redis-server)
         - [External Redis Server](#external-redis-server)
@@ -237,9 +233,9 @@ docker run --name gitlab -d \
 
 ## Database
 
-GitLab uses a database backend to store its data. You can configure this image to use either MySQL or PostgreSQL.
+GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL.
 
-*Note: GitLab HQ recommends using PostgreSQL over MySQL*
+*Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL*
 
 ### PostgreSQL
 
@@ -261,7 +257,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d \
-    --env 'DB_ADAPTER=postgresql' --env 'DB_HOST=192.168.1.100' \
+    --env 'DB_HOST=192.168.1.100' \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
@@ -272,7 +268,7 @@ docker run --name gitlab -d \
 
 You can link this image with a postgresql container for the database requirements. The alias of the postgresql server container should be set to **postgresql** while linking with the gitlab image.
 
-If a postgresql container is linked, only the `DB_ADAPTER`, `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on.
+If a postgresql container is linked, only the `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on.
 
 To illustrate linking with a postgresql container, we will use the [sameersbn/postgresql](https://github.com/sameersbn/docker-postgresql) image. When using postgresql image in production you should mount a volume for the postgresql data store. Please refer the [README](https://github.com/sameersbn/docker-postgresql/blob/master/README.md) of docker-postgresql for details.
 
@@ -319,103 +315,6 @@ Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PA
  - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
  - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
 
-### MySQL
-
-#### Internal MySQL Server
-
-The internal mysql server has been removed from the image. Please use a [linked mysql](#linking-to-mysql-container) container or specify a connection to a [external mysql](#external-mysql-server) server.
-
-If you have been using the internal mysql server follow these instructions to migrate to a linked mysql container:
-
-Assuming that your mysql data is available at `/srv/docker/gitlab/mysql`
-
-```bash
-docker run --name gitlab-mysql -d \
-    --volume /srv/docker/gitlab/mysql:/var/lib/mysql \
-    sameersbn/mysql:5.7.26-0
-```
-
-This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database.
-
-All you need to do now is link this mysql container to the gitlab ci container using the `--link gitlab-mysql:mysql` option and provide the `DB_NAME`, `DB_USER` and `DB_PASS` parameters.
-
-Refer to [Linking to MySQL Container](#linking-to-mysql-container) for more information.
-
-#### External MySQL Server
-
-The image can be configured to use an external MySQL database. The database configuration should be specified using environment variables while starting the GitLab image.
-
-Before you start the GitLab image create user and database for gitlab.
-
-```sql
-CREATE USER 'gitlab'@'%.%.%.%' IDENTIFIED BY 'password';
-CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
-GRANT ALL PRIVILEGES ON `gitlabhq_production`.* TO 'gitlab'@'%.%.%.%';
-```
-
-We are now ready to start the GitLab application.
-
-*Assuming that the mysql server host is 192.168.1.100*
-
-```bash
-docker run --name gitlab -d \
-    --env 'DB_ADAPTER=mysql2' --env 'DB_HOST=192.168.1.100' \
-    --env 'DB_NAME=gitlabhq_production' \
-    --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
-    --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
-```
-
-#### Linking to MySQL Container
-
-You can link this image with a mysql container for the database requirements. The alias of the mysql server container should be set to **mysql** while linking with the gitlab image.
-
-If a mysql container is linked, only the `DB_ADAPTER`, `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on.
-
-To illustrate linking with a mysql container, we will use the [sameersbn/mysql](https://github.com/sameersbn/docker-mysql) image. When using docker-mysql in production you should mount a volume for the mysql data store. Please refer the [README](https://github.com/sameersbn/docker-mysql/blob/master/README.md) of docker-mysql for details.
-
-First, lets pull the mysql image from the docker index.
-
-```bash
-docker pull sameersbn/mysql:5.7.26-0
-```
-
-For data persistence lets create a store for the mysql and start the container.
-
-SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux.
-
-```bash
-mkdir -p /srv/docker/gitlab/mysql
-sudo chcon -Rt svirt_sandbox_file_t /srv/docker/gitlab/mysql
-```
-
-The run command looks like this.
-
-```bash
-docker run --name gitlab-mysql -d \
-    --env 'DB_NAME=gitlabhq_production' \
-    --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
-    --volume /srv/docker/gitlab/mysql:/var/lib/mysql \
-    sameersbn/mysql:5.7.26-0
-```
-
-The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database.
-
-We are now ready to start the GitLab application.
-
-```bash
-docker run --name gitlab -d --link gitlab-mysql:mysql \
-    --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
-```
-
-Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
-
- - [mysql](https://hub.docker.com/_/mysql/)
- - [sameersbn/mysql](https://quay.io/repository/sameersbn/mysql/)
- - [centurylink/mysql](https://hub.docker.com/r/centurylink/mysql/)
- - [orchardup/mysql](https://hub.docker.com/r/orchardup/mysql/)
-
 ## Redis
 
 GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables.
@@ -1024,9 +923,8 @@ Below is the complete list of available options that can be used to customize yo
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
 | `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` |
-| `DB_ADAPTER` | The database type. Possible values: `mysql2`, `postgresql`. Defaults to `postgresql`. |
-| `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` and `mysql2`, this parameter defaults to `unicode` and `utf8` respectively. |
-| `DB_COLLATION` | The database collation. Defaults to `utf8_general_ci` for `DB_ADAPTER` `mysql2`. This parameter is not supported for `DB_ADAPTER` `postresql` and will be removed. |
+| `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
+| `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |
 | `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. |
 | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` |
diff --git a/assets/build/install.sh b/assets/build/install.sh
index ab96d6eef..a6ca79416 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -20,7 +20,7 @@ export GOROOT PATH
 
 BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libc6-dev ruby${RUBY_VERSION}-dev \
-  libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
+  libpq-dev zlib1g-dev libyaml-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
   gettext libkrb5-dev"
@@ -153,7 +153,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
   chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache
 fi
 
-exec_as_git bundle install -j"$(nproc)" --deployment --without development test aws
+exec_as_git bundle install -j"$(nproc)" --deployment --without development test mysql aws
 
 # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user
 chown -R ${GITLAB_USER}: ${GITLAB_HOME}
@@ -161,7 +161,7 @@ chown -R ${GITLAB_USER}: ${GITLAB_HOME}
 # gitlab.yml and database.yml are required for `assets:precompile`
 exec_as_git cp ${GITLAB_INSTALL_DIR}/config/resque.yml.example ${GITLAB_INSTALL_DIR}/config/resque.yml
 exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_DIR}/config/gitlab.yml
-exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.mysql ${GITLAB_INSTALL_DIR}/config/database.yml
+exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
 
 # Installs nodejs packages required to compile webpack
 exec_as_git yarn install --production --pure-lockfile
diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index 9cfd80373..f7845428c 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -2,10 +2,8 @@
 # PRODUCTION
 #
 production:
-  adapter: {{DB_ADAPTER}}
+  adapter: postgresql
   encoding: {{DB_ENCODING}}
-  collation: {{DB_COLLATION}}
-  reconnect: false
   database: {{DB_NAME}}
   host: {{DB_HOST}}
   port: {{DB_PORT}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 0834090da..929e77797 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -35,7 +35,7 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-$GITLAB_HTTPS_HSTS_MAXAGE} # backward com
 NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
 
 ## DATABASE
-DB_ADAPTER=${DB_ADAPTER:-}
+DB_ADAPTER=${DB_ADAPTER:-postgresql}
 DB_ENCODING=${DB_ENCODING:-}
 DB_COLLATION=${DB_COLLATION:-}
 DB_HOST=${DB_HOST:-}
@@ -47,7 +47,6 @@ DB_POOL=${DB_POOL:-10}
 
 # backward compatibility
 case ${DB_TYPE} in
-  mysql) DB_ADAPTER=${DB_ADAPTER:-mysql2} ;;
   postgres) DB_ADAPTER=${DB_ADAPTER:-postgresql} ;;
 esac
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 6c3b42831..c83389470 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -102,47 +102,30 @@ gitlab_finalize_database_parameters() {
   # is a mysql or postgresql database linked?
   # requires that the mysql or postgresql containers have exposed
   # port 3306 and 5432 respectively.
-  if [[ -n ${MYSQL_PORT_3306_TCP_ADDR} ]]; then
-    DB_ADAPTER=${DB_ADAPTER:-mysql2}
-    DB_HOST=${DB_HOST:-${MYSQL_PORT_3306_TCP_ADDR}}
-    DB_PORT=${DB_PORT:-${MYSQL_PORT_3306_TCP_PORT}}
-
-    # support for linked sameersbn/mysql image
-    DB_USER=${DB_USER:-${MYSQL_ENV_DB_USER}}
-    DB_PASS=${DB_PASS:-${MYSQL_ENV_DB_PASS}}
-    DB_NAME=${DB_NAME:-${MYSQL_ENV_DB_NAME}}
-
-    # support for linked orchardup/mysql and enturylink/mysql image
-    # also supports official mysql image
-    DB_USER=${DB_USER:-${MYSQL_ENV_MYSQL_USER}}
-    DB_PASS=${DB_PASS:-${MYSQL_ENV_MYSQL_PASSWORD}}
-    DB_NAME=${DB_NAME:-${MYSQL_ENV_MYSQL_DATABASE}}
-  elif [[ -n ${POSTGRESQL_PORT_5432_TCP_ADDR} ]]; then
-    DB_ADAPTER=${DB_ADAPTER:-postgresql}
-    DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}
-    DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}}
-
-    # support for linked official postgres image
-    DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRES_USER}}
-    DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRES_PASSWORD}}
-    DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_DB}}
-    DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_USER}}
-
-    # support for linked sameersbn/postgresql image
-    DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}}
-    DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}}
-    DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB_NAME}}
-
-    # support for linked orchardup/postgresql image
-    DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}}
-    DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}}
-    DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}}
-
-    # support for linked paintedfox/postgresql image
-    DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}}
-    DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}}
-    DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}}
-  fi
+  DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}
+  DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}}
+
+  # support for linked official postgres image
+  DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRES_USER}}
+  DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRES_PASSWORD}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_DB}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_USER}}
+
+  # support for linked sameersbn/postgresql image
+  DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}}
+  DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB_NAME}}
+
+  # support for linked orchardup/postgresql image
+  DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}}
+  DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}}
+
+  # support for linked paintedfox/postgresql image
+  DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}}
+  DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}}
+  DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}}
+  
 
   if [[ -z ${DB_HOST} ]]; then
     echo
@@ -155,27 +138,11 @@ gitlab_finalize_database_parameters() {
   fi
 
   # set default port number if not specified
-  DB_ADAPTER=${DB_ADAPTER:-postgresql}
-  case ${DB_ADAPTER} in
-    mysql2)
-      DB_ENCODING=${DB_ENCODING:-utf8}
-      DB_COLLATION=${DB_COLLATION:-utf8_general_ci}
-      DB_PORT=${DB_PORT:-3306}
-      ;;
-    postgresql)
-      DB_ENCODING=${DB_ENCODING:-unicode}
-      # DB_COLLATION: Not supported for postgresql and will be removed below.
-      DB_PORT=${DB_PORT:-5432}
-      ;;
-    *)
-      echo
-      echo "ERROR: "
-      echo "  Please specify the database type in use via the DB_ADAPTER configuration option."
-      echo "  Accepted values are \"postgresql\" or \"mysql2\". Aborting..."
-      echo
-      return 1
-      ;;
-  esac
+
+  DB_ENCODING=${DB_ENCODING:-unicode}
+  # DB_COLLATION: Not supported for postgresql and will be removed below.
+  DB_PORT=${DB_PORT:-5432}
+
 
   # set default user and database
   DB_USER=${DB_USER:-root}
@@ -183,15 +150,10 @@ gitlab_finalize_database_parameters() {
 }
 
 gitlab_check_database_connection() {
-  case ${DB_ADAPTER} in
-    mysql2)
-      prog="mysqladmin -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} status"
-      ;;
-    postgresql)
-      prog=$(find /usr/lib/postgresql/ -name pg_isready)
-      prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1"
-      ;;
-  esac
+
+  prog=$(find /usr/lib/postgresql/ -name pg_isready)
+  prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1"
+
   timeout=60
   while ! ${prog} >/dev/null 2>&1
   do
@@ -214,22 +176,13 @@ gitlab_configure_database() {
   gitlab_check_database_connection
 
   update_template ${GITLAB_DATABASE_CONFIG} \
-    DB_ADAPTER \
     DB_ENCODING \
-    DB_COLLATION \
     DB_HOST \
     DB_PORT \
     DB_NAME \
     DB_USER \
     DB_PASS \
     DB_POOL
-
-  if [[ ${DB_ADAPTER} == postgresql ]]; then
-    exec_as_git sed -i \
-      -e "/reconnect: /d" \
-      -e "/collation: /d" \
-      ${GITLAB_DATABASE_CONFIG}
-  fi
 }
 
 gitlab_finalize_redis_parameters() {
@@ -1724,16 +1677,9 @@ configure_nginx() {
 
 migrate_database() {
   # run the `gitlab:setup` rake task if required
-  case ${DB_ADAPTER} in
-    mysql2)
-      QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = '${DB_NAME}';"
-      COUNT=$(mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} -ss -e "${QUERY}")
-      ;;
-    postgresql)
-      QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public';"
-      COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}")
-      ;;
-  esac
+  QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public';"
+  COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}")
+
 
   if [[ -z ${COUNT} || ${COUNT} -eq 0 ]]; then
     echo "Setting up GitLab for firstrun. Please be patient, this could take a while..."
@@ -1773,10 +1719,6 @@ migrate_database() {
     echo "Migrating database..."
     exec_as_git bundle exec rake db:migrate >/dev/null
 
-    if [[ ${DB_ADAPTER} == mysql2 ]]; then
-      exec_as_git bundle exec rake add_limits_mysql >/dev/null
-    fi
-
     echo "${GITLAB_VERSION}" > ${GITLAB_TEMP_DIR}/VERSION
     rm -rf ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT # force cache cleanup
   fi

From e209ba3bf4763fb4cf3498c1b713c6f608e7b644 Mon Sep 17 00:00:00 2001
From: Nontawat Numor <nontawat39@gmail.com>
Date: Thu, 8 Aug 2019 17:47:26 +0700
Subject: [PATCH 0278/1124] Update wrong config README.md

Ref to file ./assets/runtime/env-defaults

## Cron Jobs
GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"}
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f900f08b7..6366b3f68 100644
--- a/README.md
+++ b/README.md
@@ -819,7 +819,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` |
+| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'` |
 | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
 | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
 | `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` |

From 7c96eeea583eda9421fc2273909a9c6d0c571046 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 11 Aug 2019 19:54:23 +0200
Subject: [PATCH 0279/1124] release 12.1.0


From 946bfd3d101bf3a457d8cf6f6e126b8615660460 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 08:35:52 +0200
Subject: [PATCH 0280/1124] Upgrade GitLab CE to 12.1.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 601fe96cb..2bea21164 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.1**
+- gitlab: upgrade CE to v12.1.1
+
 **12.1.0**
 - gitlab: upgrade CE to v12.1.0
 - Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) 
diff --git a/Dockerfile b/Dockerfile
index dd74bc376..ae10f692e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.0
+ARG VERSION=12.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 6366b3f68..7230a231b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.0
+# sameersbn/gitlab:12.1.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.0
+docker pull sameersbn/gitlab:12.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.0
+ sameersbn/gitlab:12.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.0
+    sameersbn/gitlab:12.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:sanitize
+    sameersbn/gitlab:12.1.1 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake db:setup
+    sameersbn/gitlab:12.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.0
+docker pull sameersbn/gitlab:12.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 77903b35f..a5545292c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.0
+12.1.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 7222e10f2..3baa75298 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.0
+    image: sameersbn/gitlab:12.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 46088db1d..0709aba55 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.0
+docker pull sameersbn/gitlab:12.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.0
+sameersbn/gitlab:12.1.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 780fc5912..fc2035a71 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.0
+        image: sameersbn/gitlab:12.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 0a65c2a66f90cbba3ee71ff4e688d2813aebf79a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 21:08:37 +0200
Subject: [PATCH 0281/1124] release 12.1.1


From 9397ffba070b20ce9ad302ec6204e82fbf5c1383 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 08:38:39 +0200
Subject: [PATCH 0282/1124] Upgrade GitLab CE to 12.1.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2bea21164..f13194dc1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.2**
+- gitlab: upgrade CE to v12.1.2
+
 **12.1.1**
 - gitlab: upgrade CE to v12.1.1
 
diff --git a/Dockerfile b/Dockerfile
index ae10f692e..30f851441 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.1
+ARG VERSION=12.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 7230a231b..bb072ec6b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.1
+# sameersbn/gitlab:12.1.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.1
+docker pull sameersbn/gitlab:12.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.1
+ sameersbn/gitlab:12.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.1
+    sameersbn/gitlab:12.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:sanitize
+    sameersbn/gitlab:12.1.2 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake db:setup
+    sameersbn/gitlab:12.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.1
+docker pull sameersbn/gitlab:12.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a5545292c..a54d1ceed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.1
+12.1.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 3baa75298..7570e11f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.1
+    image: sameersbn/gitlab:12.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0709aba55..4c48553bc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.1
+docker pull sameersbn/gitlab:12.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.1
+sameersbn/gitlab:12.1.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fc2035a71..3c9a83566 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.1
+        image: sameersbn/gitlab:12.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 19bad7b0f245534bc72aac3eed58f0301865e53f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 21:24:11 +0200
Subject: [PATCH 0283/1124] release 12.1.2


From d9e787616a18e8aa951f54f3f2c379a7d3ae6551 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 08:39:43 +0200
Subject: [PATCH 0284/1124] Upgrade GitLab CE to 12.1.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f13194dc1..bd4861102 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.3**
+- gitlab: upgrade CE to v12.1.3
+
 **12.1.2**
 - gitlab: upgrade CE to v12.1.2
 
diff --git a/Dockerfile b/Dockerfile
index 30f851441..b0f9d87c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.2
+ARG VERSION=12.1.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index bb072ec6b..f99831a3b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.2
+# sameersbn/gitlab:12.1.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.2
+docker pull sameersbn/gitlab:12.1.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.2
+ sameersbn/gitlab:12.1.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.2
+    sameersbn/gitlab:12.1.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:sanitize
+    sameersbn/gitlab:12.1.3 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake db:setup
+    sameersbn/gitlab:12.1.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.2
+docker pull sameersbn/gitlab:12.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a54d1ceed..c7c14531d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.2
+12.1.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 7570e11f9..26dd82514 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.2
+    image: sameersbn/gitlab:12.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4c48553bc..39cda2b07 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.2
+docker pull sameersbn/gitlab:12.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.2
+sameersbn/gitlab:12.1.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3c9a83566..f1f35d3f2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.2
+        image: sameersbn/gitlab:12.1.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 0cb31a93f91e1abda77993b113e3146bfc32ba6a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:05:18 +0200
Subject: [PATCH 0285/1124] release 12.1.3


From e11cec487bfce549e01b77a6a902a101e6b324c8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 12 Aug 2019 08:40:53 +0200
Subject: [PATCH 0286/1124] Upgrade GitLab CE to 12.1.4

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bd4861102..4f5daff2b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.4**
+- gitlab: upgrade CE to v12.1.4
+
 **12.1.3**
 - gitlab: upgrade CE to v12.1.3
 
diff --git a/Dockerfile b/Dockerfile
index b0f9d87c9..6ecf9c7d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.3
+ARG VERSION=12.1.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index f99831a3b..4a7a750ce 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.3
+# sameersbn/gitlab:12.1.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.3
+docker pull sameersbn/gitlab:12.1.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.3
+ sameersbn/gitlab:12.1.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.3
+    sameersbn/gitlab:12.1.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:sanitize
+    sameersbn/gitlab:12.1.4 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake db:setup
+    sameersbn/gitlab:12.1.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.3
+docker pull sameersbn/gitlab:12.1.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index c7c14531d..33b637b40 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.3
+12.1.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 26dd82514..7cca826a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.3
+    image: sameersbn/gitlab:12.1.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 39cda2b07..461eb3340 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.3
+docker pull sameersbn/gitlab:12.1.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.3
+sameersbn/gitlab:12.1.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f1f35d3f2..d2b3701ab 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.3
+        image: sameersbn/gitlab:12.1.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 04215cc44a1a163aea0c34195b8682a8721f12dd Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:17:34 +0200
Subject: [PATCH 0287/1124] release 12.1.4


From 0eef0816878821098ad85818ca0518d93cced060 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:21:47 +0200
Subject: [PATCH 0288/1124] Upgrade GitLab CE to 12.1.6

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4f5daff2b..26499c7b5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.1.6**
+- gitlab: upgrade CE to v12.1.6
+
 **12.1.4**
 - gitlab: upgrade CE to v12.1.4
 
diff --git a/Dockerfile b/Dockerfile
index 6ecf9c7d8..21cd99b2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.4
+ARG VERSION=12.1.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 4a7a750ce..3a162004c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.4
+# sameersbn/gitlab:12.1.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.4
+docker pull sameersbn/gitlab:12.1.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.4
+ sameersbn/gitlab:12.1.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.4
+    sameersbn/gitlab:12.1.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:sanitize
+    sameersbn/gitlab:12.1.6 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake db:setup
+    sameersbn/gitlab:12.1.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.1.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.1.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.4
+docker pull sameersbn/gitlab:12.1.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 33b637b40..9152894cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.4
+12.1.6
diff --git a/docker-compose.yml b/docker-compose.yml
index 7cca826a7..268728b34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.4
+    image: sameersbn/gitlab:12.1.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 461eb3340..18e759118 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.4
+docker pull sameersbn/gitlab:12.1.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.4
+sameersbn/gitlab:12.1.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d2b3701ab..9455aaf53 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.4
+        image: sameersbn/gitlab:12.1.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 2adc96656938cdf9c14aa6418907f0c0dbfe38c0 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:21:59 +0200
Subject: [PATCH 0289/1124] Update gitlab-pages to 1.7.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 21cd99b2d..3f4ea2e2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
-    GITLAB_PAGES_VERSION=1.7.0 \
+    GITLAB_PAGES_VERSION=1.7.1 \
     GITALY_SERVER_VERSION=1.53.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 791adf9c96fbfea6ee64d3960121e52fe067994c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:21:59 +0200
Subject: [PATCH 0290/1124] Update gitaly to 1.53.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3f4ea2e2b..c875bcde0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.7.0 \
     GITLAB_PAGES_VERSION=1.7.1 \
-    GITALY_SERVER_VERSION=1.53.0 \
+    GITALY_SERVER_VERSION=1.53.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From c57f92dffc039ba28d59ee4799ca6b49d23ebc36 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 13 Aug 2019 07:27:11 +0200
Subject: [PATCH 0291/1124] release 12.1.6


From 8f5f7f0f9d8233a7b45b7f43b764846726d0c979 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Aug 2019 07:02:41 +0200
Subject: [PATCH 0292/1124] Upgrade GitLab CE to 12.2.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 26499c7b5..ce6968b5f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.2.0**
+- gitlab: upgrade CE to v12.2.0
+
 **12.1.6**
 - gitlab: upgrade CE to v12.1.6
 
diff --git a/Dockerfile b/Dockerfile
index c875bcde0..c0a62f028 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.1.6
+ARG VERSION=12.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 3a162004c..aaf92f33a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.1.6
+# sameersbn/gitlab:12.2.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.1.6
+docker pull sameersbn/gitlab:12.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.1.6
+ sameersbn/gitlab:12.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.1.6
+    sameersbn/gitlab:12.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:sanitize
+    sameersbn/gitlab:12.2.0 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake db:setup
+    sameersbn/gitlab:12.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.1.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.6
+docker pull sameersbn/gitlab:12.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9152894cb..685332623 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.1.6
+12.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 268728b34..9b2b3c687 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.1.6
+    image: sameersbn/gitlab:12.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 18e759118..a29b4ab04 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.1.6
+docker pull sameersbn/gitlab:12.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.1.6
+sameersbn/gitlab:12.2.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9455aaf53..e67d61fbc 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.1.6
+        image: sameersbn/gitlab:12.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From e4a2f8703b362aebc0db52087a4d2e9a00625bff Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Aug 2019 07:02:54 +0200
Subject: [PATCH 0293/1124] Update gitlab-workhorse to 8.8.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c0a62f028..d0b05bb70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.6 \
     GITLAB_SHELL_VERSION=9.3.0 \
-    GITLAB_WORKHORSE_VERSION=8.7.0 \
+    GITLAB_WORKHORSE_VERSION=8.8.0 \
     GITLAB_PAGES_VERSION=1.7.1 \
     GITALY_SERVER_VERSION=1.53.2 \
     GITLAB_USER="git" \

From 888bf5e4f21131a2827d827c9279cdb576da938d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Aug 2019 07:02:55 +0200
Subject: [PATCH 0294/1124] Update gitaly to 1.59.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d0b05bb70..4734210a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.8.0 \
     GITLAB_PAGES_VERSION=1.7.1 \
-    GITALY_SERVER_VERSION=1.53.2 \
+    GITALY_SERVER_VERSION=1.59.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 33d97605d670dbbd55b43da077c1f090ec26be97 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 22 Aug 2019 07:48:38 +0200
Subject: [PATCH 0295/1124] Upgrade base-image to ubuntu:bionic

---
 Dockerfile              | 28 +++++++++++++++-------------
 assets/build/install.sh |  4 ++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4734210a3..f01e8625a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial-20190720
+FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -6,7 +6,7 @@ ARG VERSION=12.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.12.6 \
+    GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.8.0 \
     GITLAB_PAGES_VERSION=1.7.1 \
@@ -27,27 +27,29 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-      wget ca-certificates apt-transport-https \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
- && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main" >> /etc/apt/sources.list \
+      wget ca-certificates apt-transport-https gnupg2
+RUN set -ex && \
+ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
+ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \
- && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu xenial main" >> /etc/apt/sources.list \
+ && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu bionic main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \
- && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu xenial main" >> /etc/apt/sources.list \
+ && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu bionic main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
- && echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_8.x xenial main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb https://deb.nodesource.com/node_12.x bionic main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
+ && set -ex \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server postgresql-client-10 redis-tools \
-      git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \
+      nginx openssh-server postgresql-client-10 postgresql-contrib-10 redis-tools \
+      git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
-      libgdbm3 libreadline6 libncurses5 libffi6 \
-      libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \
+      libgdbm5 libreadline7 libncurses5 libffi6 \
+      libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index a6ca79416..734432f07 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -42,9 +42,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL
 # Applying the mark late here does make the build usable on PaX kernels, but
 # still the build itself must be executed on a non-PaX kernel. It's done here
 # only for simplicity.
-paxctl -Cm "$(command -v ruby${RUBY_VERSION})"
+paxctl -cvm "$(command -v ruby${RUBY_VERSION})"
 # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
-paxctl -Cm "$(command -v nodejs)"
+paxctl -cvm "$(command -v nodejs)"
 
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub

From d2e8063deefe3667ea38ca3c7d2e397513205b23 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Mon, 26 Aug 2019 21:11:49 +0200
Subject: [PATCH 0296/1124] Add note for  base image

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index ce6968b5f..71ced4da7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **12.2.0**
 - gitlab: upgrade CE to v12.2.0
+- upgrade base image to ubuntu:bionic
 
 **12.1.6**
 - gitlab: upgrade CE to v12.1.6

From 97eebba179d7ffef89a7d6cc26583e13400c5628 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 26 Aug 2019 21:12:05 +0200
Subject: [PATCH 0297/1124] release 12.2.0


From d587abc6997e33e673d78e5695f2c612520d3c8d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 26 Aug 2019 21:14:26 +0200
Subject: [PATCH 0298/1124] Upgrade GitLab CE to 12.2.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 71ced4da7..b6b2998e5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.2.1**
+- gitlab: upgrade CE to v12.2.1
+
 **12.2.0**
 - gitlab: upgrade CE to v12.2.0
 - upgrade base image to ubuntu:bionic
diff --git a/Dockerfile b/Dockerfile
index f01e8625a..dd5095915 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.2.0
+ARG VERSION=12.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index aaf92f33a..ae1b67a37 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.0
+# sameersbn/gitlab:12.2.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.0
+docker pull sameersbn/gitlab:12.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.0
+ sameersbn/gitlab:12.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.0
+    sameersbn/gitlab:12.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:sanitize
+    sameersbn/gitlab:12.2.1 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake db:setup
+    sameersbn/gitlab:12.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.0
+docker pull sameersbn/gitlab:12.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 685332623..9e3b20582 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.0
+12.2.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b2b3c687..007524cab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.0
+    image: sameersbn/gitlab:12.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a29b4ab04..60f9cb7b5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.0
+docker pull sameersbn/gitlab:12.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.0
+sameersbn/gitlab:12.2.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e67d61fbc..645ad05a0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.0
+        image: sameersbn/gitlab:12.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From cc474269d5eee9d788ca388a156a98a25ab12fcf Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 27 Aug 2019 22:10:14 +0200
Subject: [PATCH 0299/1124] Fix HostKey function for ubuntu:bionic

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index c83389470..be51298d0 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1439,7 +1439,7 @@ generate_ssh_key() {
 }
 
 generate_ssh_host_keys() {
-  sed -i "s|HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config
+  sed -i "s|#HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config
   if [[ ! -e ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key ]]; then
     echo -n "Generating OpenSSH host keys... "
     generate_ssh_key rsa      ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key

From 61d3859bd05c12df6bd38b6aa49de33409ed7272 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 28 Aug 2019 07:22:53 +0200
Subject: [PATCH 0300/1124] Upgrade GitLab Image to 12.2.1-1

---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index ae1b67a37..4f2092ea0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.1
+# sameersbn/gitlab:12.2.1-1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1
+docker pull sameersbn/gitlab:12.2.1-1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.1
+ sameersbn/gitlab:12.2.1-1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.1
+    sameersbn/gitlab:12.2.1-1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:sanitize
+    sameersbn/gitlab:12.2.1-1 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake db:setup
+    sameersbn/gitlab:12.2.1-1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.1-1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1
+docker pull sameersbn/gitlab:12.2.1-1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1-1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9e3b20582..8371e3dd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.1
+12.2.1-1
diff --git a/docker-compose.yml b/docker-compose.yml
index 007524cab..0cfe6b5c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.1
+    image: sameersbn/gitlab:12.2.1-1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 60f9cb7b5..89450ab2a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1
+docker pull sameersbn/gitlab:12.2.1-1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.1
+sameersbn/gitlab:12.2.1-1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 645ad05a0..9bad40dc9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.1
+        image: sameersbn/gitlab:12.2.1-1
         env:
         - name: TZ
           value: Asia/Kolkata

From 315b52dee30de84b16c107c121fe3db0f62ca9d6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 28 Aug 2019 07:24:31 +0200
Subject: [PATCH 0301/1124] release 12.2.1-1


From 788597063eb80b46ade153398f2277dfa8a1718e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 1 Sep 2019 19:16:53 +0200
Subject: [PATCH 0302/1124] Upgrade GitLab CE to 12.2.3

---
 Changelog.md               |  3 +++
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 6 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b6b2998e5..fd83dbdea 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.2.3**
+- gitlab: upgrade CE to v12.2.3
+
 **12.2.1**
 - gitlab: upgrade CE to v12.2.1
 
diff --git a/README.md b/README.md
index 4f2092ea0..ce35961c8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.1-1
+# sameersbn/gitlab:12.2.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1-1
+docker pull sameersbn/gitlab:12.2.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.1-1
+ sameersbn/gitlab:12.2.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.1-1
+    sameersbn/gitlab:12.2.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:sanitize
+    sameersbn/gitlab:12.2.3 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake db:setup
+    sameersbn/gitlab:12.2.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.1-1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1-1
+docker pull sameersbn/gitlab:12.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1-1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 8371e3dd3..9446bf2be 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.1-1
+12.2.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cfe6b5c8..5ba55c2dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.1-1
+    image: sameersbn/gitlab:12.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 89450ab2a..43979ebe0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.1-1
+docker pull sameersbn/gitlab:12.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.1-1
+sameersbn/gitlab:12.2.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9bad40dc9..902e6ee5f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.1-1
+        image: sameersbn/gitlab:12.2.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 76897ccada787e6724b1d8984f40766fc76a2fc3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 1 Sep 2019 19:17:08 +0200
Subject: [PATCH 0303/1124] Update gitlab-workhorse to 8.8.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dd5095915..c6e430825 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=9.3.0 \
-    GITLAB_WORKHORSE_VERSION=8.8.0 \
+    GITLAB_WORKHORSE_VERSION=8.8.1 \
     GITLAB_PAGES_VERSION=1.7.1 \
     GITALY_SERVER_VERSION=1.59.0 \
     GITLAB_USER="git" \

From 31a439b26d5008868cb84aa307ed4894d370be76 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 1 Sep 2019 19:17:08 +0200
Subject: [PATCH 0304/1124] Update gitaly to 1.59.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c6e430825..8ba2e5dd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.8.1 \
     GITLAB_PAGES_VERSION=1.7.1 \
-    GITALY_SERVER_VERSION=1.59.0 \
+    GITALY_SERVER_VERSION=1.59.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From a8790e8531014e6360c68a8778ef393f922df30d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 11 Sep 2019 21:56:23 +0200
Subject: [PATCH 0305/1124] Upgrade GitLab CE to 12.2.4

---
 Changelog.md               |  3 +++
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 6 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fd83dbdea..379fab7d4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.2.4**
+- gitlab: upgrade CE to v12.2.4
+
 **12.2.3**
 - gitlab: upgrade CE to v12.2.3
 
diff --git a/README.md b/README.md
index ce35961c8..eb1984fc2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.3
+# sameersbn/gitlab:12.2.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.3
+docker pull sameersbn/gitlab:12.2.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.3
+ sameersbn/gitlab:12.2.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.3
+    sameersbn/gitlab:12.2.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:sanitize
+    sameersbn/gitlab:12.2.4 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake db:setup
+    sameersbn/gitlab:12.2.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.3
+docker pull sameersbn/gitlab:12.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9446bf2be..8571ff0fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.3
+12.2.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 5ba55c2dd..42201dad7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.3
+    image: sameersbn/gitlab:12.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 43979ebe0..f73236a1b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.3
+docker pull sameersbn/gitlab:12.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.3
+sameersbn/gitlab:12.2.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 902e6ee5f..d3d45f74a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.3
+        image: sameersbn/gitlab:12.2.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 4791fd3fc03bd16ad8785ccc4edac1f5e3ffe8ef Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 11 Sep 2019 22:14:06 +0200
Subject: [PATCH 0306/1124] release 12.2.4


From a878a3ee7350a61d82ed5e8fd4f8254e20501121 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 11 Sep 2019 22:16:30 +0200
Subject: [PATCH 0307/1124] Upgrade GitLab CE to 12.2.5

---
 Changelog.md               |  3 +++
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 6 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 379fab7d4..983c7f116 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.2.5**
+- gitlab: upgrade CE to v12.2.5
+
 **12.2.4**
 - gitlab: upgrade CE to v12.2.4
 
diff --git a/README.md b/README.md
index eb1984fc2..c23fc0209 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.4
+# sameersbn/gitlab:12.2.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.4
+docker pull sameersbn/gitlab:12.2.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.4
+ sameersbn/gitlab:12.2.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.4
+    sameersbn/gitlab:12.2.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:sanitize
+    sameersbn/gitlab:12.2.5 app:sanitize
 ```
 
 ### Piwik
@@ -1086,7 +1086,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1121,14 +1121,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake db:setup
+    sameersbn/gitlab:12.2.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1137,7 +1137,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1187,7 +1187,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.2.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.2.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.4
+docker pull sameersbn/gitlab:12.2.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1284,7 +1284,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 8571ff0fa..c3cbe7dec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.4
+12.2.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 42201dad7..20d16bf40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.4
+    image: sameersbn/gitlab:12.2.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f73236a1b..6101ddabf 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.4
+docker pull sameersbn/gitlab:12.2.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.4
+sameersbn/gitlab:12.2.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d3d45f74a..fb82c239e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.4
+        image: sameersbn/gitlab:12.2.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 0d6fca2cd9f1fe40c37ea42a0a0d54779c66c054 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 11 Sep 2019 22:16:39 +0200
Subject: [PATCH 0308/1124] Update gitlab-pages to 1.7.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ba2e5dd3..474c84fc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=9.3.0 \
     GITLAB_WORKHORSE_VERSION=8.8.1 \
-    GITLAB_PAGES_VERSION=1.7.1 \
+    GITLAB_PAGES_VERSION=1.7.2 \
     GITALY_SERVER_VERSION=1.59.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From fc2b7a4bb58422b99ecbb588eee97b36a272868a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 11 Sep 2019 22:17:55 +0200
Subject: [PATCH 0309/1124] release 12.2.5


From 1d2fc24c80939c950f6545cdcdf947f1b913afaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=9Awi=C4=99cicki?= <tomislater@gmail.com>
Date: Tue, 17 Sep 2019 16:15:43 +0200
Subject: [PATCH 0310/1124] Change VERSION to 12.2.5

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

diff --git a/Dockerfile b/Dockerfile
index 474c84fc9..a3f1f600f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.2.1
+ARG VERSION=12.2.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \

From 9d8903a523174330035781e31799fb41950955b7 Mon Sep 17 00:00:00 2001
From: Julien Grenier <JGrenier@users.noreply.github.com>
Date: Tue, 24 Sep 2019 07:04:13 +0200
Subject: [PATCH 0311/1124] Fix Auth0 config (#1964)

Fix Auth0 configuration and Add OAUTH_AUTH0_SCOPE
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 3 ++-
 assets/runtime/env-defaults               | 3 +++
 assets/runtime/functions                  | 4 +++-
 contrib/docker-swarm/docker-compose.yml   | 1 +
 docker-compose.yml                        | 1 +
 docs/s3_compatible_storage.md             | 1 +
 7 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c23fc0209..4a76ec4a6 100644
--- a/README.md
+++ b/README.md
@@ -1026,6 +1026,7 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_AUTH0_CLIENT_ID` | Auth0 Client ID. No defaults. |
 | `OAUTH_AUTH0_CLIENT_SECRET` | Auth0 Client secret. No defaults. |
 | `OAUTH_AUTH0_DOMAIN` | Auth0 Domain. No defaults. |
+| `OAUTH_AUTH0_SCOPE` | Auth0 Scope. Defaults to `openid profile email`. |
 | `OAUTH_AZURE_API_KEY` | Azure Client ID. No defaults. |
 | `OAUTH_AZURE_API_SECRET` | Azure Client secret. No defaults. |
 | `OAUTH_AZURE_TENANT_ID` | Azure Tenant ID. No defaults. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 775b4f150..5aeeb457f 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -551,7 +551,8 @@ production: &base
           args: {
             client_id: '{{OAUTH_AUTH0_CLIENT_ID}}',
             client_secret: '{{OAUTH_AUTH0_CLIENT_SECRET}}',
-            namespace: '{{OAUTH_AUTH0_DOMAIN}}' } }
+            domain: '{{OAUTH_AUTH0_DOMAIN}}',
+            scope: '{{OAUTH_AUTH0_SCOPE}}'  } }
       - { name: 'azure_oauth2',
           args: {
             client_id: '{{OAUTH_AZURE_API_KEY}}',
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 929e77797..630a6b872 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -426,6 +426,9 @@ OAUTH_CAS3_LOGIN_URL=${OAUTH_CAS3_LOGIN_URL:-/cas/login}
 OAUTH_CAS3_VALIDATE_URL=${OAUTH_CAS3_VALIDATE_URL:-/cas/p3/serviceValidate}
 OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout}
 
+### AUTH0
+OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE:-openid profile email}
+
 ## ANALYTICS
 
 ### GOOGLE
diff --git a/assets/runtime/functions b/assets/runtime/functions
index be51298d0..fa313bd54 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -604,13 +604,15 @@ gitlab_configure_oauth_crowd() {
 gitlab_configure_oauth_auth0() {
   if [[ -n ${OAUTH_AUTH0_CLIENT_ID} && \
         -n ${OAUTH_AUTH0_CLIENT_SECRET} && \
+	-n ${OAUTH_AUTH0_SCOPE} && \
         -n ${OAUTH_AUTH0_DOMAIN} ]]; then
     echo "Configuring gitlab::oauth::auth0..."
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     update_template ${GITLAB_CONFIG} \
       OAUTH_AUTH0_CLIENT_ID \
       OAUTH_AUTH0_CLIENT_SECRET \
-      OAUTH_AUTH0_DOMAIN
+      OAUTH_AUTH0_DOMAIN \
+      OAUTH_AUTH0_SCOPE
   else
     exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_DOMAIN}}/d" ${GITLAB_CONFIG}
   fi
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 567e5035d..78fc43275 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -149,6 +149,7 @@ services:
     - OAUTH_AUTH0_CLIENT_ID=
     - OAUTH_AUTH0_CLIENT_SECRET=
     - OAUTH_AUTH0_DOMAIN=
+    - OAUTH_AUTH0_SCOPE=
 
     - OAUTH_AZURE_API_KEY=
     - OAUTH_AZURE_API_SECRET=
diff --git a/docker-compose.yml b/docker-compose.yml
index 20d16bf40..6cbc95803 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -145,6 +145,7 @@ services:
     - OAUTH_AUTH0_CLIENT_ID=
     - OAUTH_AUTH0_CLIENT_SECRET=
     - OAUTH_AUTH0_DOMAIN=
+    - OAUTH_AUTH0_SCOPE=
 
     - OAUTH_AZURE_API_KEY=
     - OAUTH_AZURE_API_SECRET=
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index d640d63c8..7471206bc 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -193,6 +193,7 @@ services:
     - OAUTH_AUTH0_CLIENT_ID=
     - OAUTH_AUTH0_CLIENT_SECRET=
     - OAUTH_AUTH0_DOMAIN=
+    - OAUTH_AUTH0_SCOPE=
     - OAUTH_AZURE_API_KEY=
     - OAUTH_AZURE_API_SECRET=
     - OAUTH_AZURE_TENANT_ID=

From edfe1492e288bc7343aaa5d9cfce010f44c7f068 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Sat, 31 Aug 2019 16:21:28 +0900
Subject: [PATCH 0312/1124] Add Sentry configuration to gitlab.yml

---
 README.md                                 | 4 ++++
 assets/runtime/config/gitlabhq/gitlab.yml | 7 +++++++
 assets/runtime/env-defaults               | 6 ++++++
 assets/runtime/functions                  | 9 +++++++++
 4 files changed, 26 insertions(+)

diff --git a/README.md b/README.md
index 4a76ec4a6..eaca90bd6 100644
--- a/README.md
+++ b/README.md
@@ -1059,6 +1059,10 @@ Below is the complete list of available options that can be used to customize yo
 | `RACK_ATTACK_FINDTIME` | Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`. |
 | `RACK_ATTACK_BANTIME` | Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`. |
 | `GITLAB_WORKHORSE_TIMEOUT` | Timeout for gitlab workhorse http proxy. Defaults to `5m0s`. |
+| `SENTRY_ENABLED` | Enables Error Reporting and Logging with Sentry. Defaults to `false`. |
+| `SENTRY_DSN` | Sentry DSN. No defaults. |
+| `SENTRY_CLIENTSIDE_DSN` | Sentry clientside DSN. No defaults. |
+| `SENTRY_ENVIRONMENT` | Sentry environment. Defaults to `production`. |
 
 ### Docker secrets and configs
 
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 5aeeb457f..7a6d9e7d0 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -310,6 +310,13 @@ production: &base
     path: {{GITLAB_REGISTRY_DIR}}
     issuer: {{GITLAB_REGISTRY_ISSUER}}
 
+  ## Error Reporting and Logging with Sentry
+  sentry:
+    enabled: {{SENTRY_ENABLED}}
+    dsn: {{SENTRY_DSN}}
+    clientside_dsn: {{SENTRY_CLIENTSIDE_DSN}}
+    environment: '{{SENTRY_ENVIRONMENT}}' # e.g. development, staging, production
+
   #
   # 2. GitLab CI settings
   # ==========================
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 630a6b872..12be50830 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -475,3 +475,9 @@ GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807}
+
+## Sentry
+SENTRY_ENABLED=${SENTRY_ENABLED:-false}
+SENTRY_DSN=${SENTRY_DSN:-}
+SENTRY_CLIENTSIDE_DSN=${SENTRY_CLIENTSIDE_DSN:-}
+SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-production}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index fa313bd54..dd282d2de 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1111,6 +1111,14 @@ gitlab_configure_pages(){
   fi
 }
 
+gitlab_configure_sentry(){
+  echo "Configuring gitlab::sentry..."
+  update_template ${GITLAB_CONFIG} \
+    SENTRY_ENABLED \
+    SENTRY_DSN \
+    SENTRY_CLIENTSIDE_DSN \
+    SENTRY_ENVIRONMENT
+}
 
 nginx_configure_gitlab_ssl() {
   if [[ ${GITLAB_HTTPS} == true && -f ${SSL_CERTIFICATE_PATH} && -f ${SSL_KEY_PATH} && -f ${SSL_DHPARAM_PATH} ]]; then
@@ -1592,6 +1600,7 @@ configure_gitlab() {
   gitlab_configure_backups
   gitlab_configure_registry
   gitlab_configure_pages
+  gitlab_configure_sentry
 
   # remove stale gitlab.socket
   rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket

From 1c7629d5a9917c9a271ecccd155e530bdc4fad6c Mon Sep 17 00:00:00 2001
From: GO Sueyoshi <sue445@users.noreply.github.com>
Date: Tue, 24 Sep 2019 14:50:48 +0900
Subject: [PATCH 0313/1124] Add prepared_statements to database.yml (#1994)

* Add prepared_statements  to database.yml

Co-Authored-By: Niclas Mietz <github@mietz.io>
---
 README.md                                   | 1 +
 assets/runtime/config/gitlabhq/database.yml | 1 +
 assets/runtime/env-defaults                 | 1 +
 assets/runtime/functions                    | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eaca90bd6..5ac2a08c2 100644
--- a/README.md
+++ b/README.md
@@ -931,6 +931,7 @@ Below is the complete list of available options that can be used to customize yo
 | `DB_USER` | The database database user. Defaults to `root` |
 | `DB_PASS` | The database database password. Defaults to no password |
 | `DB_POOL` | The database database connection pool count. Defaults to `10`. |
+| `DB_PREPARED_STATEMENTS` | Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) |
 | `SMTP_ENABLED` | Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`. |
 | `SMTP_DOMAIN` | SMTP domain. Defaults to` www.gmail.com` |
 | `SMTP_HOST` | SMTP server host. Defaults to `smtp.gmail.com`. |
diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index f7845428c..6ff2dbc83 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -10,4 +10,5 @@ production:
   username: {{DB_USER}}
   password: "{{DB_PASS}}"
   pool: {{DB_POOL}}
+  prepared_statements: {{DB_PREPARED_STATEMENTS}}
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 12be50830..68581e662 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -44,6 +44,7 @@ DB_NAME=${DB_NAME:-}
 DB_USER=${DB_USER:-}
 DB_PASS=${DB_PASS:-}
 DB_POOL=${DB_POOL:-10}
+DB_PREPARED_STATEMENTS=${DB_PREPARED_STATEMENTS:-true}
 
 # backward compatibility
 case ${DB_TYPE} in
diff --git a/assets/runtime/functions b/assets/runtime/functions
index dd282d2de..b1bba0836 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -182,7 +182,8 @@ gitlab_configure_database() {
     DB_NAME \
     DB_USER \
     DB_PASS \
-    DB_POOL
+    DB_POOL \
+    DB_PREPARED_STATEMENTS
 }
 
 gitlab_finalize_redis_parameters() {

From eadd27cdb00eb2a8a5ccdfa16b408e80e84c3276 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Tue, 24 Sep 2019 11:02:34 +0200
Subject: [PATCH 0314/1124] Fix Auth0 Scope config parsing (#2007)

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index b1bba0836..35ab8d35f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -615,7 +615,7 @@ gitlab_configure_oauth_auth0() {
       OAUTH_AUTH0_DOMAIN \
       OAUTH_AUTH0_SCOPE
   else
-    exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_DOMAIN}}/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_SCOPE}}/d" ${GITLAB_CONFIG}
   fi
 }
 

From 97ec6e337a39e738330a1a802e5b4150f292e84b Mon Sep 17 00:00:00 2001
From: Pierre Belloy <p.belloy@axelor.com>
Date: Tue, 24 Sep 2019 10:52:10 +0200
Subject: [PATCH 0315/1124] Set Sidekiq default log format to json

This follow gitlab default value.
See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32842

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
---
 README.md                                 | 2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5ac2a08c2..988605629 100644
--- a/README.md
+++ b/README.md
@@ -922,7 +922,7 @@ Below is the complete list of available options that can be used to customize yo
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
-| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` |
+| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `json` |
 | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
 | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 7a6d9e7d0..2539bea25 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -271,7 +271,7 @@ production: &base
 
   ## Sidekiq
   sidekiq:
-    log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (json is also supported)
+    log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (default is the original format)
 
   ## Auxiliary jobs
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 68581e662..c66f185f5 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -60,7 +60,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0}
 SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4}
 SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
 SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
-GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-default}
+GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 
 ## UNICORN
 UNICORN_WORKERS=${UNICORN_WORKERS:-3}

From 432ba2e1835351370e8514ed5522caf1a787bc42 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 23 Sep 2019 06:05:43 +0200
Subject: [PATCH 0316/1124] Upgrade GitLab CE to 12.3.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 983c7f116..6c0f90267 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.0**
+- gitlab: upgrade CE to v12.3.0
+
 **12.2.5**
 - gitlab: upgrade CE to v12.2.5
 
diff --git a/Dockerfile b/Dockerfile
index a3f1f600f..fa93f2a55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.2.5
+ARG VERSION=12.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 988605629..de505077a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.2.5
+# sameersbn/gitlab:12.3.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.2.5
+docker pull sameersbn/gitlab:12.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.2.5
+ sameersbn/gitlab:12.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.2.5
+    sameersbn/gitlab:12.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:sanitize
+    sameersbn/gitlab:12.3.0 app:sanitize
 ```
 
 ### Piwik
@@ -1092,7 +1092,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1127,14 +1127,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake db:setup
+    sameersbn/gitlab:12.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1143,7 +1143,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1193,7 +1193,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1206,7 +1206,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1237,7 +1237,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1259,12 +1259,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.2.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.5
+docker pull sameersbn/gitlab:12.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1290,7 +1290,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index c3cbe7dec..4d23cb8e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.2.5
+12.3.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 6cbc95803..d4955a025 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.2.5
+    image: sameersbn/gitlab:12.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6101ddabf..014554291 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.2.5
+docker pull sameersbn/gitlab:12.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.2.5
+sameersbn/gitlab:12.3.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fb82c239e..992e2596c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.2.5
+        image: sameersbn/gitlab:12.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From f3e3955c61b6e25a07ad6cb47b9b8b721bf347c2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 23 Sep 2019 06:06:13 +0200
Subject: [PATCH 0317/1124] Update gitlab-shell to 10.0.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fa93f2a55..9e9910eac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=12.3.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.9 \
-    GITLAB_SHELL_VERSION=9.3.0 \
+    GITLAB_SHELL_VERSION=10.0.0 \
     GITLAB_WORKHORSE_VERSION=8.8.1 \
     GITLAB_PAGES_VERSION=1.7.2 \
     GITALY_SERVER_VERSION=1.59.2 \

From 8964a62a2b0c761309525de859baa7d8dc41fc4f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 23 Sep 2019 06:06:14 +0200
Subject: [PATCH 0318/1124] Update gitlab-workhorse to 8.10.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9e9910eac..ec3c59b4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=10.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.8.1 \
+    GITLAB_WORKHORSE_VERSION=8.10.0 \
     GITLAB_PAGES_VERSION=1.7.2 \
     GITALY_SERVER_VERSION=1.59.2 \
     GITLAB_USER="git" \

From bf04be31b1965e335d946166f26e8514d069a31a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 23 Sep 2019 06:06:14 +0200
Subject: [PATCH 0319/1124] Update gitlab-pages to 1.9.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ec3c59b4a..86b480d4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=10.0.0 \
     GITLAB_WORKHORSE_VERSION=8.10.0 \
-    GITLAB_PAGES_VERSION=1.7.2 \
+    GITLAB_PAGES_VERSION=1.9.0 \
     GITALY_SERVER_VERSION=1.59.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From f5bc869f46eec3a49d2f7213b91f7f2f19498314 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 23 Sep 2019 06:06:14 +0200
Subject: [PATCH 0320/1124] Update gitaly to 1.65.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 86b480d4d..0ee267830 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.0.0 \
     GITLAB_WORKHORSE_VERSION=8.10.0 \
     GITLAB_PAGES_VERSION=1.9.0 \
-    GITALY_SERVER_VERSION=1.59.2 \
+    GITALY_SERVER_VERSION=1.65.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 2a6d769e6d3e56e87c469bebbe262d10f8cb6d7d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Sep 2019 11:44:25 +0200
Subject: [PATCH 0321/1124] Increase waiting to 180 seconds for circle ci

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9ff09bd9..9e1539de2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,7 +65,7 @@ jobs:
           name: Launching container for testing
           command: |
             docker-compose up -d
-            sleep 120
+            sleep 180
 
       - run:
           name: Testing image

From f5a708bfb46cd08c119d9fd9936bd91e5f4c2c82 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Sep 2019 19:16:25 +0200
Subject: [PATCH 0322/1124] release 12.3.0


From 15097275fb9f5abf4bee45999ce551eaf60cc53b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Sep 2019 19:18:30 +0200
Subject: [PATCH 0323/1124] Upgrade GitLab CE to 12.3.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6c0f90267..014d62e07 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.1**
+- gitlab: upgrade CE to v12.3.1
+
 **12.3.0**
 - gitlab: upgrade CE to v12.3.0
 
diff --git a/Dockerfile b/Dockerfile
index 0ee267830..29adf9dea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.0
+ARG VERSION=12.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index de505077a..f0240d49d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.0
+# sameersbn/gitlab:12.3.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.0
+docker pull sameersbn/gitlab:12.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.0
+ sameersbn/gitlab:12.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.0
+    sameersbn/gitlab:12.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:sanitize
+    sameersbn/gitlab:12.3.1 app:sanitize
 ```
 
 ### Piwik
@@ -1092,7 +1092,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1127,14 +1127,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake db:setup
+    sameersbn/gitlab:12.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1143,7 +1143,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1193,7 +1193,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1206,7 +1206,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1237,7 +1237,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1259,12 +1259,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.0
+docker pull sameersbn/gitlab:12.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1290,7 +1290,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4d23cb8e0..9c028e25d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.0
+12.3.1
diff --git a/docker-compose.yml b/docker-compose.yml
index d4955a025..2814d09aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.0
+    image: sameersbn/gitlab:12.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 014554291..e38cb6597 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.0
+docker pull sameersbn/gitlab:12.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.0
+sameersbn/gitlab:12.3.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 992e2596c..bc9fdb249 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.0
+        image: sameersbn/gitlab:12.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From db5a973ac5c3f992059057dc68f20624fd36fcc4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 24 Sep 2019 19:20:35 +0200
Subject: [PATCH 0324/1124] release 12.3.1


From 7ca29dfce0cedf51ff47da24c813c9b9984dddbc Mon Sep 17 00:00:00 2001
From: Pierre Belloy <p.belloy@axelor.com>
Date: Wed, 25 Sep 2019 14:50:44 +0200
Subject: [PATCH 0325/1124] Use updated gitlab-ce repository name `gitlab-foss`

Gitlab is moving to a single codebase for GitLab Community and Enterprise editions.
All code and development is moved into the gitlab-ee repository.
The code of the gitlab-ce repository remains as is, and won't include any proprietary code.
The `gitlab-ce` repository is renamed to `gitlab-foss`

See https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
---
 Changelog.md                                | 6 +++---
 README.md                                   | 8 ++++----
 assets/build/install.sh                     | 6 +++---
 assets/runtime/config/nginx/gitlab-registry | 2 +-
 docs/container_registry.md                  | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 014d62e07..ce86a7096 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
 # Changelog
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
-https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
 **12.3.1**
 - gitlab: upgrade CE to v12.3.1
@@ -42,7 +42,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **12.1.0**
 - gitlab: upgrade CE to v12.1.0
-- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) 
+- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html)
 
 **12.0.4**
 - gitlab: upgrade CE to v12.0.4
@@ -569,7 +569,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
 
 **9.3.8**
 - gitlab: upgrade to CE v9.3.8
-- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-ce/issues/35342))
+- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
 
 **9.3.7**
 - gitlab: upgrade to CE v9.3.7
diff --git a/README.md b/README.md
index f0240d49d..16dec1e30 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,9 @@
 
 Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform.
 
-GitLab CE is set up in the Docker image using the [install from source](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) method as documented in the the official GitLab documentation.
+GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the the official GitLab documentation.
 
-For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/installation/) which includes a [GitLab image for Docker](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker).
+For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/install/) which includes a [GitLab image for Docker](https://docs.gitlab.com/omnibus/docker/).
 
 # Contributing
 
@@ -528,8 +528,8 @@ This is simply done by adding the servers certificate into their list of trusted
 Again, this is a client side configuration which means that everyone who is going to communicate with the server should perform this configuration on their machine. In short, distribute the `gitlab.crt` file among your developers and ask them to add it to their list of trusted ssl certificates. Failure to do so will result in errors that look like this:
 
 ```bash
-git clone https://git.local.host/gitlab-ce.git
-fatal: unable to access 'https://git.local.host/gitlab-ce.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none
+git clone https://git.local.host/gitlab-foss.git
+fatal: unable to access 'https://git.local.host/gitlab-foss.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none
 ```
 
 You can do the same at the web browser. Instructions for installing the root certificate for firefox can be found [here](http://portal.threatpulse.com/docs/sol/Content/03Solutions/ManagePolicy/SSL/ssl_firefox_cert_ta.htm). You will find similar options chrome, just make sure you install the certificate under the authorities tab of the certificate manager dialog.
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 734432f07..b69018d6b 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git
+GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-foss.git
 GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2
 GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git
 GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
@@ -65,8 +65,8 @@ exec_as_git git config --global repack.writeBitmaps true
 exec_as_git git config --global receive.advertisePushOptions true
 
 
-# shallow clone gitlab-ce
-echo "Cloning gitlab-ce v.${GITLAB_VERSION}..."
+# shallow clone gitlab-foss
+echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
 
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index 0aa1cc30f..f973d39d6 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -16,7 +16,7 @@ server {
 }
 
 server {
-  # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/config/gitlab.yml.example#L182,
+  # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182,
   # it should be declared here as well
   listen *:{{GITLAB_REGISTRY_PORT}} ssl http2;
   server_name  {{GITLAB_REGISTRY_HOST}};
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e38cb6597..66af974aa 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -378,9 +378,9 @@ sameersbn/gitlab:12.3.1
 
 
 [wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate
-[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
+[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040
 [docker-insecure]: https://docs.docker.com/registry/insecure/
 [registry-deploy]: https://docs.docker.com/registry/deploying/
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
 [token-config]: https://docs.docker.com/registry/configuration/#token
-[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md
+[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md

From ea1fce2c4bbaa71411e7340fe2a57c0cc0f5f498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20R=C3=B6mer?=
 <16097755+hroemer@users.noreply.github.com>
Date: Thu, 26 Sep 2019 06:26:12 +0200
Subject: [PATCH 0326/1124] Documentation update on Docker config and secrets
 file env and example fix (#1980)

* fixed typos in referenced config and secret files

* updated documentation on external configs and secrets and added note on hard-coded config keys

* updated documentation link to sample config

* updated documentation link to sample config

* updated documentation links to config keys

* updated documentation links to config keys

* updated documentation links to config keys
---
 README.md                                              | 8 +++++++-
 contrib/docker-swarm/{gitlab.config => gitlab.configs} | 0
 contrib/docker-swarm/{gitlab.secret => gitlab.secrets} | 0
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename contrib/docker-swarm/{gitlab.config => gitlab.configs} (100%)
 rename contrib/docker-swarm/{gitlab.secret => gitlab.secrets} (100%)

diff --git a/README.md b/README.md
index 16dec1e30..bf454b4f2 100644
--- a/README.md
+++ b/README.md
@@ -1072,7 +1072,13 @@ and then both docker-compose and Docker Swarm can import them into your gitlab c
 
 On startup, the gitlab container will source env vars from a config file labeled `gitlab-config`, and then a secrets file labeled `gitlab-secrets` (both mounted in the default locations).
 
-See the exmample `config/docker-swarm/docker-compose.yml` file, and the example `gitlab.config` and `gitlab.secrets` file.
+See the example [`contrib/docker-swarm/docker-compose.yml`](./contrib/docker-swarm/docker-compose.yml) file, and the
+example `gitlab.configs` and `gitlab.secrets` file.
+You may as well choose file names other than the example source files (`gitlab.configs` and `gitlab.secrets`) and update
+the `file: ./gitlab.configs` and `file: ./gitlab.secrets` references accordingly. But do not alter the config
+keys [`gitlab-configs`](contrib/docker-swarm/docker-compose.yml#L158) and
+[`gitlab-secrets`](contrib/docker-swarm/docker-compose.yml#L162) as they are currently
+[hardcoded](./assets/runtime/functions#L4:L9) and thus must be kept as in the example.
 
 If you're not using one of these files, then don't include its entry in the docker-compose file.
 
diff --git a/contrib/docker-swarm/gitlab.config b/contrib/docker-swarm/gitlab.configs
similarity index 100%
rename from contrib/docker-swarm/gitlab.config
rename to contrib/docker-swarm/gitlab.configs
diff --git a/contrib/docker-swarm/gitlab.secret b/contrib/docker-swarm/gitlab.secrets
similarity index 100%
rename from contrib/docker-swarm/gitlab.secret
rename to contrib/docker-swarm/gitlab.secrets

From 73cb6392fdf135f60abf949e5de17c970630ad23 Mon Sep 17 00:00:00 2001
From: pbe-axelor <p.belloy@axelor.com>
Date: Thu, 26 Sep 2019 06:58:29 +0200
Subject: [PATCH 0327/1124] Add S/MIME Email Signing (#2009)

* Add S/MIME Email Signing

See https://docs.gitlab.com/ce/administration/smime_signing_email.html

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>

* Remove s/mime email configs if not enabled

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
---
 README.md                                 |  3 +++
 assets/runtime/config/gitlabhq/gitlab.yml | 11 +++++++++++
 assets/runtime/env-defaults               |  3 +++
 assets/runtime/functions                  | 13 ++++++++++++-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf454b4f2..028a628f8 100644
--- a/README.md
+++ b/README.md
@@ -772,6 +772,9 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. |
 | `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. |
 | `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. |
+| `GITLAB_EMAIL_SMIME_ENABLE` | Enable or disable email S/MIME signing. Defaults is `false`. |
+| `GITLAB_EMAIL_SMIME_KEY_FILE` | Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``. |
+| `GITLAB_EMAIL_SMIME_CERT_FILE` | Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. |
 | `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) |
 | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
 | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 2539bea25..e43c58db9 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -70,6 +70,17 @@ production: &base
     email_display_name: {{GITLAB_EMAIL_DISPLAY_NAME}}
     email_reply_to: {{GITLAB_EMAIL_REPLY_TO}}
     email_subject_suffix: '{{GITLAB_EMAIL_SUBJECT_SUFFIX}}'
+    #start-email-smime
+    email_smime:
+      # Uncomment and set to true if you need to enable email S/MIME signing (default: false)
+      enabled: {{GITLAB_EMAIL_SMIME_ENABLE}}
+      # S/MIME private key file in PEM format, unencrypted
+      # Default is '.gitlab_smime_key' relative to Rails.root (i.e. root of the GitLab app).
+      key_file: {{GITLAB_EMAIL_SMIME_KEY_FILE}}
+      # S/MIME public certificate key in PEM format, will be attached to signed messages
+      # Default is '.gitlab_smime_cert' relative to Rails.root (i.e. root of the GitLab app).
+      cert_file: {{GITLAB_EMAIL_SMIME_CERT_FILE}}
+      #end-email-smime
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index c66f185f5..7fef1ebd7 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -283,6 +283,9 @@ GITLAB_EMAIL_SUBJECT_SUFFIX=${GITLAB_EMAIL_SUBJECT_SUFFIX:-}
 GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com}
 GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@example.com}
 GITLAB_EMAIL_DISPLAY_NAME=${GITLAB_EMAIL_DISPLAY_NAME:-GitLab}
+GITLAB_EMAIL_SMIME_ENABLE=${GITLAB_EMAIL_SMIME_ENABLE:-false}
+GITLAB_EMAIL_SMIME_KEY_FILE=${GITLAB_EMAIL_SMIME_KEY_FILE:-}
+GITLAB_EMAIL_SMIME_CERT_FILE=${GITLAB_EMAIL_SMIME_CERT_FILE:-}
 
 ## INCOMING MAIL
 IMAP_HOST=${IMAP_HOST:-imap.gmail.com}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 35ab8d35f..d641c3383 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -125,7 +125,7 @@ gitlab_finalize_database_parameters() {
   DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}}
   DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}}
   DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}}
-  
+
 
   if [[ -z ${DB_HOST} ]]; then
     echo
@@ -351,6 +351,17 @@ gitlab_configure_mail_delivery() {
     GITLAB_EMAIL_DISPLAY_NAME \
     GITLAB_EMAIL_REPLY_TO \
     GITLAB_EMAIL_SUBJECT_SUFFIX
+
+  if [[ ${GITLAB_EMAIL_SMIME_ENABLE} == true ]]; then
+    exec_as_git sed -i "/#start-email-smime/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/#end-email-smime/d" ${GITLAB_CONFIG}
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_EMAIL_SMIME_ENABLE \
+      GITLAB_EMAIL_SMIME_KEY_FILE \
+      GITLAB_EMAIL_SMIME_CERT_FILE
+  else
+    exec_as_git sed -i "/#start-email-smime/,/#end-email-smime/d" ${GITLAB_CONFIG}
+  fi
 }
 
 gitlab_configure_mailroom() {

From 44b432aaae770e7b16ed88f9e6609c571f692307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandra=20Tatarevi=C4=87ov=C3=A1?=
 <sandra.tatarevicova@ackee.cz>
Date: Fri, 27 Sep 2019 09:37:20 +0200
Subject: [PATCH 0328/1124] Fix GITLAB_PAGES_ACCESS_REDIRECT_URI documentation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 028a628f8..2f75392b1 100644
--- a/README.md
+++ b/README.md
@@ -888,7 +888,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PAGES_ACCESS_CONTROL_SERVER` | Gitlab instance URI, example: `https://gitlab.example.io` |
 | `GITLAB_PAGES_ACCESS_CLIENT_ID` | Client ID from earlier generated OAuth application |
 | `GITLAB_PAGES_ACCESS_CLIENT_SECRET` | Client Secret from earlier genereated OAuth application |
-| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` |
+| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth` |
 | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. |
 | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` |
 | `GITALY_TOKEN` | Set a gitaly token, blank by default. |

From 968b7e9c8ffeae8f95c2579f3395742de4a9df87 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 30 Sep 2019 15:13:51 +0200
Subject: [PATCH 0329/1124] Upgrade GitLab CE to 12.3.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ce86a7096..66536ae76 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.2**
+- gitlab: upgrade CE to v12.3.2
+
 **12.3.1**
 - gitlab: upgrade CE to v12.3.1
 
diff --git a/Dockerfile b/Dockerfile
index 29adf9dea..20ac86bc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.1
+ARG VERSION=12.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 2f75392b1..0f457f5c2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.1
+# sameersbn/gitlab:12.3.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.1
+docker pull sameersbn/gitlab:12.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.1
+ sameersbn/gitlab:12.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.1
+    sameersbn/gitlab:12.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:sanitize
+    sameersbn/gitlab:12.3.2 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake db:setup
+    sameersbn/gitlab:12.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.1
+docker pull sameersbn/gitlab:12.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9c028e25d..1701b30e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.1
+12.3.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 2814d09aa..01d39e874 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.1
+    image: sameersbn/gitlab:12.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 66af974aa..a44f7bcb5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.1
+docker pull sameersbn/gitlab:12.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.1
+sameersbn/gitlab:12.3.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bc9fdb249..93ff17eb2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.1
+        image: sameersbn/gitlab:12.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From ed38720a9f1e956e300c29a2885c9192144a50d7 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 30 Sep 2019 15:14:08 +0200
Subject: [PATCH 0330/1124] Update gitaly to 1.65.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 20ac86bc5..817eb9082 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.0.0 \
     GITLAB_WORKHORSE_VERSION=8.10.0 \
     GITLAB_PAGES_VERSION=1.9.0 \
-    GITALY_SERVER_VERSION=1.65.0 \
+    GITALY_SERVER_VERSION=1.65.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From c92b4b828485528df36bff5b72a9fddfd28bcffd Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 30 Sep 2019 15:15:34 +0200
Subject: [PATCH 0331/1124] release 12.3.2


From 491ab7f24515c164d1188dca777bffa6955b4ff9 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Wed, 2 Oct 2019 14:54:29 +0200
Subject: [PATCH 0332/1124] fix: increase circle no_output_timeout to 60
 minutes

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e1539de2..f8fef58e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,6 +60,7 @@ jobs:
               --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
               --build-arg VCS_REF=$(git rev-parse --short HEAD) \
               -t ${IMAGE_NAME}:$(cat VERSION) .
+          no_output_timeout: 60m
 
       - run:
           name: Launching container for testing

From 121ff35b92c7bf1e092f9044aa9023a33396d100 Mon Sep 17 00:00:00 2001
From: phenomax <max.uetrecht@protonmail.com>
Date: Wed, 2 Oct 2019 13:48:09 +0200
Subject: [PATCH 0333/1124] upgrade CE to v12.3.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 66536ae76..939c3660b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.3**
+- gitlab: upgrade CE to v12.3.3
+
 **12.3.2**
 - gitlab: upgrade CE to v12.3.2
 
diff --git a/Dockerfile b/Dockerfile
index 817eb9082..601eb8a15 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.2
+ARG VERSION=12.3.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 0f457f5c2..12c5263d4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.2
+# sameersbn/gitlab:12.3.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.2
+docker pull sameersbn/gitlab:12.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.2
+ sameersbn/gitlab:12.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.2
+    sameersbn/gitlab:12.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:sanitize
+    sameersbn/gitlab:12.3.3 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake db:setup
+    sameersbn/gitlab:12.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.2
+docker pull sameersbn/gitlab:12.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1701b30e1..021d59961 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.2
+12.3.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 01d39e874..cfcfc2348 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.2
+    image: sameersbn/gitlab:12.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a44f7bcb5..edb1c1f85 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.2
+docker pull sameersbn/gitlab:12.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.2
+sameersbn/gitlab:12.3.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 93ff17eb2..1b79e5bea 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.2
+        image: sameersbn/gitlab:12.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 7adb375e8c38929c02704763475005edc6bb478d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 2 Oct 2019 17:35:29 +0200
Subject: [PATCH 0334/1124] release 12.3.3


From 0a50e8eff685b79f8807971cd70954b4f2c7e394 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 4 Oct 2019 10:20:12 +0200
Subject: [PATCH 0335/1124] Upgrade GitLab CE to 12.3.4

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 939c3660b..9a26bee74 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.4**
+- gitlab: upgrade CE to v12.3.4
+
 **12.3.3**
 - gitlab: upgrade CE to v12.3.3
 
diff --git a/Dockerfile b/Dockerfile
index 601eb8a15..b19299e27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.3
+ARG VERSION=12.3.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 12c5263d4..48e017411 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.3
+# sameersbn/gitlab:12.3.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.3
+docker pull sameersbn/gitlab:12.3.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.3
+ sameersbn/gitlab:12.3.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.3
+    sameersbn/gitlab:12.3.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:sanitize
+    sameersbn/gitlab:12.3.4 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake db:setup
+    sameersbn/gitlab:12.3.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.3
+docker pull sameersbn/gitlab:12.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 021d59961..ab69bef60 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.3
+12.3.4
diff --git a/docker-compose.yml b/docker-compose.yml
index cfcfc2348..bc7b84088 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.3
+    image: sameersbn/gitlab:12.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index edb1c1f85..2a372128c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.3
+docker pull sameersbn/gitlab:12.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.3
+sameersbn/gitlab:12.3.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1b79e5bea..a10266238 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.3
+        image: sameersbn/gitlab:12.3.4
         env:
         - name: TZ
           value: Asia/Kolkata

From e6cf252fbe6eb46988541a711882b8686c49d0d0 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 4 Oct 2019 11:16:13 +0200
Subject: [PATCH 0336/1124] release 12.3.4


From f37514ecf8c8cf42856786b2d3fef00e1d046a0a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 4 Oct 2019 12:03:41 +0200
Subject: [PATCH 0337/1124] Use docker volumes instead of bind mounts

---
 docker-compose.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bc7b84088..e9266b4ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,13 +7,13 @@ services:
     command:
     - --loglevel warning
     volumes:
-    - /srv/docker/gitlab/redis:/var/lib/redis:Z
+    - redis-data:/var/lib/redis:Z
 
   postgresql:
     restart: always
     image: sameersbn/postgresql:10-2
     volumes:
-    - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
+    - postgresql-data:/var/lib/postgresql:Z
     environment:
     - DB_USER=gitlab
     - DB_PASS=password
@@ -30,7 +30,7 @@ services:
     - "10080:80"
     - "10022:22"
     volumes:
-    - /srv/docker/gitlab/gitlab:/home/git/data:Z
+    - gitlab-data:/home/git/data:Z
     environment:
     - DEBUG=false
 
@@ -150,3 +150,8 @@ services:
     - OAUTH_AZURE_API_KEY=
     - OAUTH_AZURE_API_SECRET=
     - OAUTH_AZURE_TENANT_ID=
+
+volumes:
+  redis-data:
+  postgresql-data:
+  gitlab-data:

From 7bf3c2b37d6d8c66657ca675ec7af2172cbbe329 Mon Sep 17 00:00:00 2001
From: Abel Tay <abel.tay@gmail.com>
Date: Tue, 8 Oct 2019 13:25:29 +0800
Subject: [PATCH 0338/1124] Upgrade GitLab CE to 12.3.5

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9a26bee74..f40eabac5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.3.5**
+- gitlab: upgrade CE to v12.3.5
+
 **12.3.4**
 - gitlab: upgrade CE to v12.3.4
 
diff --git a/Dockerfile b/Dockerfile
index b19299e27..d03598de1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.4
+ARG VERSION=12.3.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 48e017411..cb0da63b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.4
+# sameersbn/gitlab:12.3.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.4
+docker pull sameersbn/gitlab:12.3.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.4
+ sameersbn/gitlab:12.3.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.3.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:sanitize
+    sameersbn/gitlab:12.3.5 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake db:setup
+    sameersbn/gitlab:12.3.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.3.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.3.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.4
+docker pull sameersbn/gitlab:12.3.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ab69bef60..a1e7534db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.4
+12.3.5
diff --git a/docker-compose.yml b/docker-compose.yml
index e9266b4ef..6f3bf669c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.4
+    image: sameersbn/gitlab:12.3.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2a372128c..f8d5e730d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.4
+docker pull sameersbn/gitlab:12.3.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.4
+sameersbn/gitlab:12.3.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a10266238..6f7011cf0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.4
+        image: sameersbn/gitlab:12.3.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 7bba0f62db2a2723a256e77ab828ee3887466461 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 8 Oct 2019 08:13:22 +0200
Subject: [PATCH 0339/1124] release 12.3.5


From 7e86b54241fa5323827a535ebf53b108d5519796 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Tue, 22 Oct 2019 10:09:09 +0200
Subject: [PATCH 0340/1124] Remove deprecated "ssl" directives from nginx

Before this commit running "nginx -c -f /etc/nginx/nginx.conf" warned:

    nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead in /etc/nginx/sites-enabled/gitlab:60
---
 assets/runtime/config/nginx/gitlab-pages-ssl | 1 -
 assets/runtime/config/nginx/gitlab-registry  | 1 -
 assets/runtime/config/nginx/gitlab-ssl       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl
index 17ab05e93..dba9f0a2e 100644
--- a/assets/runtime/config/nginx/gitlab-pages-ssl
+++ b/assets/runtime/config/nginx/gitlab-pages-ssl
@@ -31,7 +31,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_PAGES_CERT_PATH}};
   ssl_certificate_key {{SSL_PAGES_KEY_PATH}};
 
diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index f973d39d6..562b37ef2 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -27,7 +27,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_REGISTRY_CERT_PATH}};
   ssl_certificate_key {{SSL_REGISTRY_KEY_PATH}};
 
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 7674979be..24acfe171 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -53,7 +53,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_CERTIFICATE_PATH}};
   ssl_certificate_key {{SSL_KEY_PATH}};
   ssl_verify_client {{SSL_VERIFY_CLIENT}};

From aa10ebcf014b6ae7831b174c0ec77644957cc944 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Tue, 22 Oct 2019 10:41:14 +0200
Subject: [PATCH 0341/1124] Hide unused envvar DB_COLLATION

MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961
and PostgreSQL doesn't support it anyway.
---
 assets/runtime/env-defaults | 1 -
 assets/runtime/functions    | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 7fef1ebd7..38a78608d 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -37,7 +37,6 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
 ## DATABASE
 DB_ADAPTER=${DB_ADAPTER:-postgresql}
 DB_ENCODING=${DB_ENCODING:-}
-DB_COLLATION=${DB_COLLATION:-}
 DB_HOST=${DB_HOST:-}
 DB_PORT=${DB_PORT:-}
 DB_NAME=${DB_NAME:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index d641c3383..2665edc18 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -138,11 +138,9 @@ gitlab_finalize_database_parameters() {
   fi
 
   # set default port number if not specified
-
-  DB_ENCODING=${DB_ENCODING:-unicode}
-  # DB_COLLATION: Not supported for postgresql and will be removed below.
   DB_PORT=${DB_PORT:-5432}
 
+  DB_ENCODING=${DB_ENCODING:-unicode}
 
   # set default user and database
   DB_USER=${DB_USER:-root}

From 384bfbc5d9233816790927483cdcf30f205b6a4f Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Tue, 22 Oct 2019 11:00:01 +0200
Subject: [PATCH 0342/1124] Enforce `CI_REGISTRY_PASSWORD` dropping
 `CI_REGISTRY_PASS`

---
 .gitlab-ci.yml  | 6 +++---
 CONTRIBUTING.md | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3e190bd0..5e7b17980 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ before_script:
   - export VERSION=$(cat VERSION)
   - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com}
   - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token}
-  - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASS:-${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}}
+  - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}
   - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}}
   - |
     if [ "${DOCKER_IMAGE}" = "/" ]; then
@@ -35,7 +35,7 @@ docker:build:branches:
   except:
     - master
   script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker build
       --pull
       --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
@@ -49,7 +49,7 @@ docker:build:release:
   only:
     - tags
   script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker build
       --pull
       --cache-from=${DOCKER_IMAGE}:${VERSION}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d180caaba..dbb5cdb4d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,5 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C
 | `CI_REGISTRY`          | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
 | `CI_REGISTRY_USER`     | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
 | `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
-| `CI_REGISTRY_PASS`     | `${CI_JOB_TOKEN}`  | DEPRECATED: Use `CI_REGISTRY_PASSWORD`                                                                                                                                                                                   |
 | `DOCKER_IMAGE`         | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |

From cd54bace5ceb1a38bc1767a88e8cf63f34d6fc2e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Oct 2019 21:00:27 +0200
Subject: [PATCH 0343/1124] Upgrade GitLab CE to 12.4.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f40eabac5..32cfddd4a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.4.0**
+- gitlab: upgrade CE to v12.4.0
+
 **12.3.5**
 - gitlab: upgrade CE to v12.3.5
 
diff --git a/Dockerfile b/Dockerfile
index d03598de1..c4649231b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.5
+ARG VERSION=12.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index cb0da63b1..e03de7750 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.3.5
+# sameersbn/gitlab:12.4.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.5
+docker pull sameersbn/gitlab:12.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.5
+ sameersbn/gitlab:12.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.5
+    sameersbn/gitlab:12.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:sanitize
+    sameersbn/gitlab:12.4.0 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake db:setup
+    sameersbn/gitlab:12.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.5
+docker pull sameersbn/gitlab:12.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a1e7534db..f8c17e780 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.3.5
+12.4.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f3bf669c..57dcd78b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.3.5
+    image: sameersbn/gitlab:12.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f8d5e730d..82f928154 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.5
+docker pull sameersbn/gitlab:12.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.3.5
+sameersbn/gitlab:12.4.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6f7011cf0..c295a22ac 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.3.5
+        image: sameersbn/gitlab:12.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 2e74ea1721839544efe9e47dc2ef528eb1cc0477 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Oct 2019 21:00:44 +0200
Subject: [PATCH 0344/1124] Update gitlab-shell to 10.2.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c4649231b..2efa567f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=12.4.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.9 \
-    GITLAB_SHELL_VERSION=10.0.0 \
+    GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.10.0 \
     GITLAB_PAGES_VERSION=1.9.0 \
     GITALY_SERVER_VERSION=1.65.1 \

From 7d1c256bace9d91ef27d799414de72bdf0d0dbcf Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Oct 2019 21:00:45 +0200
Subject: [PATCH 0345/1124] Update gitlab-workhorse to 8.14.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2efa567f1..dd9782ea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=10.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.10.0 \
+    GITLAB_WORKHORSE_VERSION=8.14.0 \
     GITLAB_PAGES_VERSION=1.9.0 \
     GITALY_SERVER_VERSION=1.65.1 \
     GITLAB_USER="git" \

From a5ed98d58b6ecd55741c2ea66cd5bf42b76db3c4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Oct 2019 21:00:45 +0200
Subject: [PATCH 0346/1124] Update gitlab-pages to 1.11.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dd9782ea9..ccfc782b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.9 \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.0 \
-    GITLAB_PAGES_VERSION=1.9.0 \
+    GITLAB_PAGES_VERSION=1.11.0 \
     GITALY_SERVER_VERSION=1.65.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 35bfc34c469498760dbd1d3be5bcf697c3c89e82 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 22 Oct 2019 21:00:45 +0200
Subject: [PATCH 0347/1124] Update gitaly to 1.67.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ccfc782b4..3f4095642 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.0 \
     GITLAB_PAGES_VERSION=1.11.0 \
-    GITALY_SERVER_VERSION=1.65.1 \
+    GITALY_SERVER_VERSION=1.67.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 19c49d1a45c35bda2e937fae41495143f049a6e4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 23 Oct 2019 01:09:14 +0200
Subject: [PATCH 0348/1124] update base-image to ubuntu:bionic-20191010

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3f4095642..87877fbc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20190807
+FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF

From 4607505c82f3fcb495f4e58bc74dbbde1288173c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 23 Oct 2019 01:09:34 +0200
Subject: [PATCH 0349/1124] Update golang to 1.12.12

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 87877fbc3..45c77665a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=12.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.12.9 \
+    GOLANG_VERSION=1.12.12 \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.0 \
     GITLAB_PAGES_VERSION=1.11.0 \

From 4788ebedd786e53f1d7143dd1ecae5ebe2fffc6b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 23 Oct 2019 02:18:38 +0200
Subject: [PATCH 0350/1124] release 12.4.0


From ae4c826c5a8370ee36aabc329d426d02a6151ef5 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <peter@leitzen.de>
Date: Tue, 22 Oct 2019 10:33:37 +0200
Subject: [PATCH 0351/1124] Remove remaining references to MySQL

MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961
---
 README.md                | 2 +-
 assets/runtime/functions | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e03de7750..c2835fdaa 100644
--- a/README.md
+++ b/README.md
@@ -929,7 +929,7 @@ Below is the complete list of available options that can be used to customize yo
 | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
 | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |
-| `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. |
+| `DB_PORT` | The database server port. Defaults to `5432` for postgresql. |
 | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` |
 | `DB_USER` | The database database user. Defaults to `root` |
 | `DB_PASS` | The database database password. Defaults to no password |
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 2665edc18..573b98923 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -99,9 +99,8 @@ update_template() {
 }
 
 gitlab_finalize_database_parameters() {
-  # is a mysql or postgresql database linked?
-  # requires that the mysql or postgresql containers have exposed
-  # port 3306 and 5432 respectively.
+  # is a postgresql database linked?
+  # requires that the postgresql containers have exposed port 5432.
   DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}
   DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}}
 

From 6c8ef9d02df45ff472c57225b804e7104400b1f4 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 2 Nov 2019 15:24:15 +0100
Subject: [PATCH 0352/1124] Upgrade GitLab CE to 12.4.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 32cfddd4a..3ef3081ad 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.4.1**
+- gitlab: upgrade CE to v12.4.1
+
 **12.4.0**
 - gitlab: upgrade CE to v12.4.0
 
diff --git a/Dockerfile b/Dockerfile
index 45c77665a..b1dac7bf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.4.0
+ARG VERSION=12.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index c2835fdaa..1970e1871 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.4.0
+# sameersbn/gitlab:12.4.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.4.0
+docker pull sameersbn/gitlab:12.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.4.0
+ sameersbn/gitlab:12.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.4.0
+    sameersbn/gitlab:12.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:sanitize
+    sameersbn/gitlab:12.4.1 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake db:setup
+    sameersbn/gitlab:12.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.0
+docker pull sameersbn/gitlab:12.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index f8c17e780..c3b555771 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.4.0
+12.4.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 57dcd78b1..139f6662a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.4.0
+    image: sameersbn/gitlab:12.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 82f928154..f2a911727 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.0
+docker pull sameersbn/gitlab:12.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.4.0
+sameersbn/gitlab:12.4.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c295a22ac..755d9199c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.4.0
+        image: sameersbn/gitlab:12.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From b568dd835a3475f8311d528f9232585e22ad62b6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 3 Nov 2019 11:07:23 +0100
Subject: [PATCH 0353/1124] release 12.4.1


From 5ba1b213e81e063f6e0c5a261523402946803ae8 Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Mon, 4 Nov 2019 19:19:33 +0100
Subject: [PATCH 0354/1124] gitlab: upgrade CE to v12.4.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3ef3081ad..9d944f429 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.4.2**
+- gitlab: upgrade CE to v12.4.2
+
 **12.4.1**
 - gitlab: upgrade CE to v12.4.1
 
diff --git a/Dockerfile b/Dockerfile
index b1dac7bf8..67f8707f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.4.1
+ARG VERSION=12.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 1970e1871..034bad9fd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.4.1
+# sameersbn/gitlab:12.4.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.4.1
+docker pull sameersbn/gitlab:12.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.4.1
+ sameersbn/gitlab:12.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.4.1
+    sameersbn/gitlab:12.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:sanitize
+    sameersbn/gitlab:12.4.2 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake db:setup
+    sameersbn/gitlab:12.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.1
+docker pull sameersbn/gitlab:12.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index c3b555771..efcb73eed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.4.1
+12.4.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 139f6662a..bf9639fa1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.4.1
+    image: sameersbn/gitlab:12.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f2a911727..ec066237f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.1
+docker pull sameersbn/gitlab:12.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.4.1
+sameersbn/gitlab:12.4.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 755d9199c..cb8655475 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.4.1
+        image: sameersbn/gitlab:12.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 11b03e24d0d5fce097c90fb4be8db1ac7eafc4ba Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 4 Nov 2019 20:52:25 +0100
Subject: [PATCH 0355/1124] release 12.4.2


From 33f2cfb61b259e74acc10c8f074af2a307080cdf Mon Sep 17 00:00:00 2001
From: Pierre Belloy <p.belloy@axelor.com>
Date: Fri, 22 Nov 2019 11:21:53 +0100
Subject: [PATCH 0356/1124] Upgrade GitLab CE to 12.4.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9d944f429..c5304f0f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.4.3**
+- gitlab: upgrade CE to v12.4.3
+
 **12.4.2**
 - gitlab: upgrade CE to v12.4.2
 
diff --git a/Dockerfile b/Dockerfile
index 67f8707f4..1941aadb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.4.2
+ARG VERSION=12.4.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 034bad9fd..b4b942160 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.4.2
+# sameersbn/gitlab:12.4.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.4.2
+docker pull sameersbn/gitlab:12.4.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.4.2
+ sameersbn/gitlab:12.4.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.4.2
+    sameersbn/gitlab:12.4.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:sanitize
+    sameersbn/gitlab:12.4.3 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake db:setup
+    sameersbn/gitlab:12.4.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.4.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.2
+docker pull sameersbn/gitlab:12.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index efcb73eed..9f3bdf87a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.4.2
+12.4.3
diff --git a/docker-compose.yml b/docker-compose.yml
index bf9639fa1..286d3bc0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.4.2
+    image: sameersbn/gitlab:12.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ec066237f..0db18d19e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.2
+docker pull sameersbn/gitlab:12.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.4.2
+sameersbn/gitlab:12.4.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index cb8655475..a3253c760 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.4.2
+        image: sameersbn/gitlab:12.4.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 8f704a6c5818db25f3da73f0e0c2d1c142ad36d7 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 Nov 2019 07:45:27 +0100
Subject: [PATCH 0357/1124] release 12.4.3


From 05f9029ef6962bf4f96b98b9970d43e29eec59a3 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 Nov 2019 07:50:10 +0100
Subject: [PATCH 0358/1124] Upgrade GitLab CE to 12.5.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5304f0f5..f1d8fb2c6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.0**
+- gitlab: upgrade CE to v12.5.0
+
 **12.4.3**
 - gitlab: upgrade CE to v12.4.3
 
diff --git a/Dockerfile b/Dockerfile
index 1941aadb5..4a63e7335 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.4.3
+ARG VERSION=12.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index b4b942160..f18bbc337 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.4.3
+# sameersbn/gitlab:12.5.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.4.3
+docker pull sameersbn/gitlab:12.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.4.3
+ sameersbn/gitlab:12.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.4.3
+    sameersbn/gitlab:12.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:sanitize
+    sameersbn/gitlab:12.5.0 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake db:setup
+    sameersbn/gitlab:12.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.3
+docker pull sameersbn/gitlab:12.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9f3bdf87a..b7d7205d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.4.3
+12.5.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 286d3bc0b..b12d9fecb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.4.3
+    image: sameersbn/gitlab:12.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0db18d19e..de5605172 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.4.3
+docker pull sameersbn/gitlab:12.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.4.3
+sameersbn/gitlab:12.5.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a3253c760..9d762901d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.4.3
+        image: sameersbn/gitlab:12.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c615a5bb4887b08424299091bc81ba6f5504c542 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 Nov 2019 07:50:34 +0100
Subject: [PATCH 0359/1124] Update gitlab-pages to 1.12.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4a63e7335..e0cb59bca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.12 \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.0 \
-    GITLAB_PAGES_VERSION=1.11.0 \
+    GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.67.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 45e1851d3fbc73c639cdcad9953dbd6974bf8768 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 Nov 2019 07:50:34 +0100
Subject: [PATCH 0360/1124] Update gitaly to 1.72.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e0cb59bca..c7d8cf691 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.67.0 \
+    GITALY_SERVER_VERSION=1.72.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 4446da4b6df13e961cacd953a058c426030de4b8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 11:00:01 +0100
Subject: [PATCH 0361/1124] release 12.5.0


From a656f32e1a5b29902cd854f56ff51e6e1121f7a1 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 11:01:05 +0100
Subject: [PATCH 0362/1124] Upgrade GitLab CE to 12.5.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f1d8fb2c6..5aea94196 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.1**
+- gitlab: upgrade CE to v12.5.1
+
 **12.5.0**
 - gitlab: upgrade CE to v12.5.0
 
diff --git a/Dockerfile b/Dockerfile
index c7d8cf691..5500ba6e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.0
+ARG VERSION=12.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index f18bbc337..ab84b6ca1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.0
+# sameersbn/gitlab:12.5.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.0
+docker pull sameersbn/gitlab:12.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.0
+ sameersbn/gitlab:12.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.0
+    sameersbn/gitlab:12.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:sanitize
+    sameersbn/gitlab:12.5.1 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake db:setup
+    sameersbn/gitlab:12.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.0
+docker pull sameersbn/gitlab:12.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b7d7205d7..2b4b4d7cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.0
+12.5.1
diff --git a/docker-compose.yml b/docker-compose.yml
index b12d9fecb..477548a2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.0
+    image: sameersbn/gitlab:12.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index de5605172..2c7e9f657 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.0
+docker pull sameersbn/gitlab:12.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.0
+sameersbn/gitlab:12.5.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9d762901d..13f053ded 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.0
+        image: sameersbn/gitlab:12.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 87b1ec7bb935f326110e3cc240df6b1584db416d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 11:01:12 +0100
Subject: [PATCH 0363/1124] Update gitlab-workhorse to 8.14.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5500ba6e4..40e84dc3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.12 \
     GITLAB_SHELL_VERSION=10.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.14.0 \
+    GITLAB_WORKHORSE_VERSION=8.14.1 \
     GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.72.0 \
     GITLAB_USER="git" \

From c008d5f0da64fc1815270bf07a4cee86c79b3f12 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 11:01:13 +0100
Subject: [PATCH 0364/1124] Update gitaly to 1.72.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 40e84dc3c..854966449 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.1 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.72.0 \
+    GITALY_SERVER_VERSION=1.72.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From c4283455dfbadc213057d4a1f8d986547b337342 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 11:49:47 +0100
Subject: [PATCH 0365/1124] release 12.5.1


From 4e05bff84b4aa577073e47bed8bcfad9a7e0ed2a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 13:44:04 +0100
Subject: [PATCH 0366/1124] Upgrade GitLab CE to 12.5.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5aea94196..e50cb3516 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.2**
+- gitlab: upgrade CE to v12.5.2
+
 **12.5.1**
 - gitlab: upgrade CE to v12.5.1
 
diff --git a/Dockerfile b/Dockerfile
index 854966449..a684d3def 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.1
+ARG VERSION=12.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index ab84b6ca1..34fb819b4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.1
+# sameersbn/gitlab:12.5.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.1
+docker pull sameersbn/gitlab:12.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.1
+ sameersbn/gitlab:12.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.1
+    sameersbn/gitlab:12.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:sanitize
+    sameersbn/gitlab:12.5.2 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake db:setup
+    sameersbn/gitlab:12.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.1
+docker pull sameersbn/gitlab:12.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 2b4b4d7cb..96f72240e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.1
+12.5.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 477548a2e..37a97c47b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.1
+    image: sameersbn/gitlab:12.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2c7e9f657..7ab2c2c31 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.1
+docker pull sameersbn/gitlab:12.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.1
+sameersbn/gitlab:12.5.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 13f053ded..d6ed505af 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.1
+        image: sameersbn/gitlab:12.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 05693df2fbc939e0384c2b9288d13eca4bc44754 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 14:29:13 +0100
Subject: [PATCH 0367/1124] release 12.5.2


From 99cd0940cc50cae82a2fa69275406ca29cf73b8d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 5 Dec 2019 14:30:03 +0100
Subject: [PATCH 0368/1124] Upgrade GitLab CE to 12.5.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e50cb3516..ed341737d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.3**
+- gitlab: upgrade CE to v12.5.3
+
 **12.5.2**
 - gitlab: upgrade CE to v12.5.2
 
diff --git a/Dockerfile b/Dockerfile
index a684d3def..ce0990af0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.2
+ARG VERSION=12.5.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 34fb819b4..fbd229050 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.2
+# sameersbn/gitlab:12.5.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.2
+docker pull sameersbn/gitlab:12.5.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.2
+ sameersbn/gitlab:12.5.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.2
+    sameersbn/gitlab:12.5.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:sanitize
+    sameersbn/gitlab:12.5.3 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake db:setup
+    sameersbn/gitlab:12.5.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.2
+docker pull sameersbn/gitlab:12.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 96f72240e..321973ede 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.2
+12.5.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 37a97c47b..e5de8cc3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.2
+    image: sameersbn/gitlab:12.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7ab2c2c31..2294ca098 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.2
+docker pull sameersbn/gitlab:12.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.2
+sameersbn/gitlab:12.5.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d6ed505af..35ee5e9ee 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.2
+        image: sameersbn/gitlab:12.5.3
         env:
         - name: TZ
           value: Asia/Kolkata

From a815bbd86168dcca98784865f1e1766e8c37a38e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 25 Dec 2019 11:07:56 +0100
Subject: [PATCH 0369/1124] release 12.5.3


From ab49eaef51290b894b6557583c6bd9e63af13797 Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Wed, 11 Dec 2019 18:00:02 +0100
Subject: [PATCH 0370/1124] gitlab: upgrade CE to v12.5.4

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ed341737d..1ba64b574 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.4**
+- gitlab: upgrade CE to v12.5.4
+
 **12.5.3**
 - gitlab: upgrade CE to v12.5.3
 
diff --git a/Dockerfile b/Dockerfile
index ce0990af0..1394333c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.3
+ARG VERSION=12.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index fbd229050..ee673c573 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.3
+# sameersbn/gitlab:12.5.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.3
+docker pull sameersbn/gitlab:12.5.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.3
+ sameersbn/gitlab:12.5.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.3
+    sameersbn/gitlab:12.5.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:sanitize
+    sameersbn/gitlab:12.5.4 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake db:setup
+    sameersbn/gitlab:12.5.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.3
+docker pull sameersbn/gitlab:12.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 321973ede..b6125ec50 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.3
+12.5.4
diff --git a/docker-compose.yml b/docker-compose.yml
index e5de8cc3f..b463c6ba2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.3
+    image: sameersbn/gitlab:12.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2294ca098..6f91c5f7b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.3
+docker pull sameersbn/gitlab:12.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.3
+sameersbn/gitlab:12.5.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 35ee5e9ee..213b4ce6d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.3
+        image: sameersbn/gitlab:12.5.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 46e18c9f5ec08ca8f25f1899b02403c64300b098 Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Wed, 11 Dec 2019 18:01:05 +0100
Subject: [PATCH 0371/1124] Update golang to 1.12.14

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1ba64b574..36096cb1b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 
 **12.5.4**
 - gitlab: upgrade CE to v12.5.4
+- Update golang to 1.12.14
 
 **12.5.3**
 - gitlab: upgrade CE to v12.5.3
diff --git a/Dockerfile b/Dockerfile
index 1394333c3..7d610448d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=12.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.12.12 \
+    GOLANG_VERSION=1.12.14 \
     GITLAB_SHELL_VERSION=10.2.0 \
     GITLAB_WORKHORSE_VERSION=8.14.1 \
     GITLAB_PAGES_VERSION=1.12.0 \

From 1ef03e61aba21f18644f039253cedddd1ab27c5b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:31:36 +0100
Subject: [PATCH 0372/1124] release 12.5.4


From 1cc351370fd1b355678807bfc30455ad3aaeb700 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:33:21 +0100
Subject: [PATCH 0373/1124] Upgrade GitLab CE to 12.5.5

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 36096cb1b..f13d9541c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.5**
+- gitlab: upgrade CE to v12.5.5
+
 **12.5.4**
 - gitlab: upgrade CE to v12.5.4
 - Update golang to 1.12.14
diff --git a/Dockerfile b/Dockerfile
index 7d610448d..403b9c5bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.4
+ARG VERSION=12.5.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index ee673c573..eb426bbc8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.4
+# sameersbn/gitlab:12.5.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.4
+docker pull sameersbn/gitlab:12.5.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.4
+ sameersbn/gitlab:12.5.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.4
+    sameersbn/gitlab:12.5.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:sanitize
+    sameersbn/gitlab:12.5.5 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake db:setup
+    sameersbn/gitlab:12.5.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.4
+docker pull sameersbn/gitlab:12.5.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b6125ec50..8c966ec24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.4
+12.5.5
diff --git a/docker-compose.yml b/docker-compose.yml
index b463c6ba2..6f0b68938 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.4
+    image: sameersbn/gitlab:12.5.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6f91c5f7b..a19be5062 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.4
+docker pull sameersbn/gitlab:12.5.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.4
+sameersbn/gitlab:12.5.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 213b4ce6d..f2ed15690 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.4
+        image: sameersbn/gitlab:12.5.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 8ffde0636deac39d5581cba85190852cee03264b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:34:46 +0100
Subject: [PATCH 0374/1124] release 12.5.5


From 4cbdd17941ceba3114c4293863c4fda8ad98185e Mon Sep 17 00:00:00 2001
From: Alessandro Trisolini <alessandro@unumotors.com>
Date: Fri, 17 Jan 2020 16:20:48 +0100
Subject: [PATCH 0375/1124] Upgrade GitLab CE to 12.5.6

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f13d9541c..d4a00fc7d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.6**
+- gitlab: upgrade CE to v12.5.6
+
 **12.5.5**
 - gitlab: upgrade CE to v12.5.5
 
diff --git a/Dockerfile b/Dockerfile
index 403b9c5bb..ec440d5cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.5
+ARG VERSION=12.5.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index eb426bbc8..5e94bb5ed 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.5
+# sameersbn/gitlab:12.5.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.5
+docker pull sameersbn/gitlab:12.5.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.5
+ sameersbn/gitlab:12.5.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.5
+    sameersbn/gitlab:12.5.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:sanitize
+    sameersbn/gitlab:12.5.6 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake db:setup
+    sameersbn/gitlab:12.5.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.5
+docker pull sameersbn/gitlab:12.5.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 8c966ec24..02cb4c44b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.5
+12.5.6
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f0b68938..7d415942f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.5
+    image: sameersbn/gitlab:12.5.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a19be5062..1e70cd931 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.5
+docker pull sameersbn/gitlab:12.5.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.5
+sameersbn/gitlab:12.5.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f2ed15690..748ded362 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.5
+        image: sameersbn/gitlab:12.5.6
         env:
         - name: TZ
           value: Asia/Kolkata

From d2bd161da13504d17ae8a1648d6f962ba87658ac Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 09:38:04 +0100
Subject: [PATCH 0376/1124] release 12.5.6


From c6dd6a8c2d174cba4d4fd2067f8d117ce320326c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 10:13:14 +0100
Subject: [PATCH 0377/1124] Upgrade GitLab CE to 12.5.7

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d4a00fc7d..e852ecac5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.5.7**
+- gitlab: upgrade CE to v12.5.7
+
 **12.5.6**
 - gitlab: upgrade CE to v12.5.6
 
diff --git a/Dockerfile b/Dockerfile
index ec440d5cb..663b3b360 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.6
+ARG VERSION=12.5.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 5e94bb5ed..ea1a007ee 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.6
+# sameersbn/gitlab:12.5.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.6
+docker pull sameersbn/gitlab:12.5.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.6
+ sameersbn/gitlab:12.5.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.6
+    sameersbn/gitlab:12.5.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:sanitize
+    sameersbn/gitlab:12.5.7 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake db:setup
+    sameersbn/gitlab:12.5.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:env:info
+    sameersbn/gitlab:12.5.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.5.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.5.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.6
+docker pull sameersbn/gitlab:12.5.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.7
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 02cb4c44b..c801eeabb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.6
+12.5.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d415942f..8353ea56e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.6
+    image: sameersbn/gitlab:12.5.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1e70cd931..60aac64ec 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.6
+docker pull sameersbn/gitlab:12.5.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.6
+sameersbn/gitlab:12.5.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 748ded362..616f79296 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.6
+        image: sameersbn/gitlab:12.5.7
         env:
         - name: TZ
           value: Asia/Kolkata

From e410b4e08c5759504ec3ef42c6dd8b78ef3a1888 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 10:19:40 +0100
Subject: [PATCH 0378/1124] release 12.5.7


From 4cb020eadf7cfab69aaa39d405bd6aff1d9c733f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:36:09 +0100
Subject: [PATCH 0379/1124] Upgrade GitLab CE to 12.6.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e852ecac5..24a4db257 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.6.0**
+- gitlab: upgrade CE to v12.6.0
+
 **12.5.7**
 - gitlab: upgrade CE to v12.5.7
 
diff --git a/Dockerfile b/Dockerfile
index 663b3b360..53ac6bbaf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.5.7
+ARG VERSION=12.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index ea1a007ee..3f456a2bc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.5.7
+# sameersbn/gitlab:12.6.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.5.7
+docker pull sameersbn/gitlab:12.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.5.7
+ sameersbn/gitlab:12.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.5.7
+    sameersbn/gitlab:12.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:sanitize
+    sameersbn/gitlab:12.6.0 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake db:setup
+    sameersbn/gitlab:12.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:env:info
+    sameersbn/gitlab:12.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.5.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.7
+docker pull sameersbn/gitlab:12.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index c801eeabb..062985d41 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.7
+12.6.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 8353ea56e..1231a377f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.5.7
+    image: sameersbn/gitlab:12.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 60aac64ec..039334584 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.5.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.5.7
+docker pull sameersbn/gitlab:12.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.5.7
+sameersbn/gitlab:12.6.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 616f79296..69779f885 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.5.7
+        image: sameersbn/gitlab:12.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 921a6cf5dc14d27de0cac9d7779b67a236e6a0e0 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:36:22 +0100
Subject: [PATCH 0380/1124] Update gitlab-shell to 10.3.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 53ac6bbaf..f5b63637c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=12.6.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.14 \
-    GITLAB_SHELL_VERSION=10.2.0 \
+    GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.14.1 \
     GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.72.1 \

From b13a25a3e601a67d41ae5603a7260065399595a2 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:36:22 +0100
Subject: [PATCH 0381/1124] Update gitlab-workhorse to 8.18.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f5b63637c..5b53fcd39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.14 \
     GITLAB_SHELL_VERSION=10.3.0 \
-    GITLAB_WORKHORSE_VERSION=8.14.1 \
+    GITLAB_WORKHORSE_VERSION=8.18.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.72.1 \
     GITLAB_USER="git" \

From c10b052a3155fc5822d417dc32dcb3f835d15d11 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:36:22 +0100
Subject: [PATCH 0382/1124] Update gitaly to 1.78.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5b53fcd39..ae63dbd7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.18.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.72.1 \
+    GITALY_SERVER_VERSION=1.78.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 6bde6baa7a55f0a7ef11e4394e1ce440f5e562fc Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 16:01:35 +0100
Subject: [PATCH 0383/1124] Update baseimage bionic to 20191202

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

diff --git a/Dockerfile b/Dockerfile
index ae63dbd7c..90d25a348 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20191010
+FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF

From 844d721efab136a1507a308ad82bbd4595cff6a2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 29 Dec 2019 17:32:52 +0100
Subject: [PATCH 0384/1124] fix(gitlab-shell): let gitlab-shell compile again

---
 assets/build/install.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index b69018d6b..8eb05a1e5 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -88,12 +88,10 @@ chown -R ${GITLAB_USER}: ${GITLAB_SHELL_INSTALL_DIR}
 
 cd ${GITLAB_SHELL_INSTALL_DIR}
 exec_as_git cp -a config.yml.example config.yml
-if [[ -x ./bin/compile ]]; then
-  echo "Compiling gitlab-shell golang executables..."
-  ./bin/compile
-  rm -rf go_build
-fi
-./bin/install
+
+echo "Compiling gitlab-shell golang executables..."
+exec_as_git bundle install -j"$(nproc)" --deployment --with development test
+exec_as_git "PATH=$PATH" make verify setup
 
 # remove unused repositories directory created by gitlab-shell install
 rm -rf ${GITLAB_HOME}/repositories

From 2038961a27169478646647a089822970f5ffbf83 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:31:19 +0100
Subject: [PATCH 0385/1124] release 12.6.0


From 6a225f7c668833228f82a7d119bcd1586b39be69 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:32:28 +0100
Subject: [PATCH 0386/1124] Upgrade GitLab CE to 12.6.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 24a4db257..c34273461 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.6.1**
+- gitlab: upgrade CE to v12.6.1
+
 **12.6.0**
 - gitlab: upgrade CE to v12.6.0
 
diff --git a/Dockerfile b/Dockerfile
index 90d25a348..d12725978 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.6.0
+ARG VERSION=12.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 3f456a2bc..2c41dfade 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.6.0
+# sameersbn/gitlab:12.6.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.6.0
+docker pull sameersbn/gitlab:12.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.6.0
+ sameersbn/gitlab:12.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.6.0
+    sameersbn/gitlab:12.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:sanitize
+    sameersbn/gitlab:12.6.1 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake db:setup
+    sameersbn/gitlab:12.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.0
+docker pull sameersbn/gitlab:12.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 062985d41..1b62f9172 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.0
+12.6.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 1231a377f..424e70093 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.6.0
+    image: sameersbn/gitlab:12.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 039334584..fac05cbea 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.0
+docker pull sameersbn/gitlab:12.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.6.0
+sameersbn/gitlab:12.6.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 69779f885..bdf668ed8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.6.0
+        image: sameersbn/gitlab:12.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 41adc51f11d2b9c908910248fd45a92e226aafc1 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:36:51 +0100
Subject: [PATCH 0387/1124] release 12.6.1


From 85e3cc98550498db57d9d283869b31756e546f66 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:38:38 +0100
Subject: [PATCH 0388/1124] Upgrade GitLab CE to 12.6.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c34273461..a5b0e9d99 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.6.2**
+- gitlab: upgrade CE to v12.6.2
+
 **12.6.1**
 - gitlab: upgrade CE to v12.6.1
 
diff --git a/Dockerfile b/Dockerfile
index d12725978..adbdfe51f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.6.1
+ARG VERSION=12.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 2c41dfade..1707ba202 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.6.1
+# sameersbn/gitlab:12.6.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.6.1
+docker pull sameersbn/gitlab:12.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.6.1
+ sameersbn/gitlab:12.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.6.1
+    sameersbn/gitlab:12.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:sanitize
+    sameersbn/gitlab:12.6.2 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake db:setup
+    sameersbn/gitlab:12.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.1
+docker pull sameersbn/gitlab:12.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1b62f9172..3304dae76 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.1
+12.6.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 424e70093..9a405ee24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.6.1
+    image: sameersbn/gitlab:12.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fac05cbea..95b2bebc5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.1
+docker pull sameersbn/gitlab:12.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.6.1
+sameersbn/gitlab:12.6.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bdf668ed8..f40c81f06 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.6.1
+        image: sameersbn/gitlab:12.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 8ff8a03c07092c51e75a8ff18809f3e7a8e1e58c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:40:26 +0100
Subject: [PATCH 0389/1124] release 12.6.2


From 3320c3651c1bbf310238b95520928f72908d8914 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:41:27 +0100
Subject: [PATCH 0390/1124] Upgrade GitLab CE to 12.6.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a5b0e9d99..eec6f4ad6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.6.3**
+- gitlab: upgrade CE to v12.6.3
+
 **12.6.2**
 - gitlab: upgrade CE to v12.6.2
 
diff --git a/Dockerfile b/Dockerfile
index adbdfe51f..9e6c9f85c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.6.2
+ARG VERSION=12.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 1707ba202..3fc09e3dd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.6.2
+# sameersbn/gitlab:12.6.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.6.2
+docker pull sameersbn/gitlab:12.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.6.2
+ sameersbn/gitlab:12.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.6.2
+    sameersbn/gitlab:12.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:sanitize
+    sameersbn/gitlab:12.6.3 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake db:setup
+    sameersbn/gitlab:12.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.2
+docker pull sameersbn/gitlab:12.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 3304dae76..1121ad37e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.2
+12.6.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a405ee24..28ef55e31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.6.2
+    image: sameersbn/gitlab:12.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 95b2bebc5..8b747e1aa 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.2
+docker pull sameersbn/gitlab:12.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.6.2
+sameersbn/gitlab:12.6.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f40c81f06..edf6fe698 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.6.2
+        image: sameersbn/gitlab:12.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 61eb0ef9da24998bc958bfd2fbd285bb0d9526db Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:41:35 +0100
Subject: [PATCH 0391/1124] Update gitaly to 1.77.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9e6c9f85c..a9c89901e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.18.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.78.0 \
+    GITALY_SERVER_VERSION=1.77.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 5572ecd051ebb3de4809c894baebf04c1b97a275 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:42:47 +0100
Subject: [PATCH 0392/1124] release 12.6.3


From a3fcac1722b60b3ee5f06bdb6ee87229857456ac Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:43:47 +0100
Subject: [PATCH 0393/1124] Upgrade GitLab CE to 12.6.4

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index eec6f4ad6..b4c7d6ade 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.6.4**
+- gitlab: upgrade CE to v12.6.4
+
 **12.6.3**
 - gitlab: upgrade CE to v12.6.3
 
diff --git a/Dockerfile b/Dockerfile
index a9c89901e..352b1e665 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.6.3
+ARG VERSION=12.6.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 3fc09e3dd..ad39f757a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.6.3
+# sameersbn/gitlab:12.6.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.6.3
+docker pull sameersbn/gitlab:12.6.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.6.3
+ sameersbn/gitlab:12.6.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.6.3
+    sameersbn/gitlab:12.6.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:sanitize
+    sameersbn/gitlab:12.6.4 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake db:setup
+    sameersbn/gitlab:12.6.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.6.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.6.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.6.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.3
+docker pull sameersbn/gitlab:12.6.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1121ad37e..6a642e0c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.3
+12.6.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 28ef55e31..3a0e8c274 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.6.3
+    image: sameersbn/gitlab:12.6.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8b747e1aa..bd33a7661 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.3
+docker pull sameersbn/gitlab:12.6.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.6.3
+sameersbn/gitlab:12.6.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index edf6fe698..0d7178f8b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.6.3
+        image: sameersbn/gitlab:12.6.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 908b6e3fd77e5f4248fca98015d3be4c2ebc651f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 25 Jan 2020 11:44:29 +0100
Subject: [PATCH 0394/1124] release 12.6.4


From 4bbc6aa2284aeceb52b5cce7d0364fdf7f650d0a Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 26 Dec 2019 10:36:22 +0100
Subject: [PATCH 0395/1124] Update gitaly to 1.78.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 352b1e665..f3a413c90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.18.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.77.1 \
+    GITALY_SERVER_VERSION=1.78.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From d52966803f8cfe042e451dcaa7e3b4460e624aa6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 22:58:31 +0100
Subject: [PATCH 0396/1124] Update gitlab-workhorse to 8.19.0

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

diff --git a/Dockerfile b/Dockerfile
index f3a413c90..3e3e4328e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.12.14 \
     GITLAB_SHELL_VERSION=10.3.0 \
-    GITLAB_WORKHORSE_VERSION=8.18.0 \
+    GITLAB_WORKHORSE_VERSION=8.19.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.78.0 \
     GITLAB_USER="git" \

From 63266f1e61876b8fd198ec1efdfc92c350f529e6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 22:59:52 +0100
Subject: [PATCH 0397/1124] Update gitlab-pages to 1.14.0

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

diff --git a/Dockerfile b/Dockerfile
index 3e3e4328e..978452c5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.12.14 \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.19.0 \
-    GITLAB_PAGES_VERSION=1.12.0 \
+    GITLAB_PAGES_VERSION=1.14.0 \
     GITALY_SERVER_VERSION=1.78.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 74848a60b04d6d3d9445b4ed5ffc5ef52ae52066 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 23:00:48 +0100
Subject: [PATCH 0398/1124] Update gitaly to 1.83.0

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

diff --git a/Dockerfile b/Dockerfile
index 978452c5b..7e077a36d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.19.0 \
     GITLAB_PAGES_VERSION=1.14.0 \
-    GITALY_SERVER_VERSION=1.78.0 \
+    GITALY_SERVER_VERSION=1.83.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 82f80968aeebb6d00c97a49a48881c746ab82f3c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 23:03:01 +0100
Subject: [PATCH 0399/1124] Update golang to 1.13.6

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

diff --git a/Dockerfile b/Dockerfile
index 7e077a36d..bb1b1b7a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=12.6.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.12.14 \
+    GOLANG_VERSION=1.13.6 \
     GITLAB_SHELL_VERSION=10.3.0 \
     GITLAB_WORKHORSE_VERSION=8.19.0 \
     GITLAB_PAGES_VERSION=1.14.0 \

From 342b8ecb1a0215e0c5c9ed7fee3a57d35e90a965 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 23:04:39 +0100
Subject: [PATCH 0400/1124] Upgrade GitLab CE to 12.7.0

---
 Dockerfile               |  2 +-
 README.md                | 52 ++++++++++++++++++++--------------------
 VERSION                  |  2 +-
 docker-compose.yml       |  2 +-
 kubernetes/gitlab-rc.yml |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bb1b1b7a5..02fdc6f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.6.4
+ARG VERSION=12.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index ad39f757a..bfdbab340 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.6.4
+# sameersbn/gitlab:12.7.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.6.4
+docker pull sameersbn/gitlab:12.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.6.4
+ sameersbn/gitlab:12.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.6.4
+    sameersbn/gitlab:12.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:sanitize
+    sameersbn/gitlab:12.7.0 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake db:setup
+    sameersbn/gitlab:12.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.6.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.4
+docker pull sameersbn/gitlab:12.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.6.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 6a642e0c9..e12d94fbf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.4
+12.7.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 3a0e8c274..7ce7b26ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.6.4
+    image: sameersbn/gitlab:12.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0d7178f8b..49c4b8a14 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.6.4
+        image: sameersbn/gitlab:12.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c6198da6c2c7ad76d0e11ea0965109d8678eaee2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Jan 2020 23:42:01 +0100
Subject: [PATCH 0401/1124] Update gitlab-shell to 11.0.0

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

diff --git a/Dockerfile b/Dockerfile
index 02fdc6f6c..072ffa650 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG VERSION=12.7.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.6 \
-    GITLAB_SHELL_VERSION=10.3.0 \
+    GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.19.0 \
     GITLAB_PAGES_VERSION=1.14.0 \
     GITALY_SERVER_VERSION=1.83.0 \

From 1524a0ab1db73dc92bba3c3a21cc5da65e672d03 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Jan 2020 00:10:12 +0100
Subject: [PATCH 0402/1124] Update Changelog.md

---
 Changelog.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index b4c7d6ade..179e9cb30 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.0**
+- Update gitlab-shell to 11.0.0
+- Upgrade GitLab CE to 12.7.0
+- Update golang to 1.13.6
+- Update gitaly to 1.83.0
+- Update gitlab-pages to 1.14.0
+- Update gitlab-workhorse to 8.19.0
+
 **12.6.4**
 - gitlab: upgrade CE to v12.6.4
 

From 524803fb0cade6d0f7a2310d3508b26438238d1b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 28 Jan 2020 18:24:59 +0100
Subject: [PATCH 0403/1124] release 12.7.0


From 306a59ef8d02c056f3ebb146988b7b9b71fdb836 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Jan 2020 20:41:18 +0100
Subject: [PATCH 0404/1124] Upgrade GitLab CE to 12.7.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 179e9cb30..ef6e53bf1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.2**
+- Upgrade GitLab CE to 12.7.2
+
 **12.7.0**
 - Update gitlab-shell to 11.0.0
 - Upgrade GitLab CE to 12.7.0
diff --git a/Dockerfile b/Dockerfile
index 072ffa650..8bcdda7d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.0
+ARG VERSION=12.7.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index bfdbab340..2e6562692 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.0
+# sameersbn/gitlab:12.7.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.0
+docker pull sameersbn/gitlab:12.7.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.0
+ sameersbn/gitlab:12.7.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.0
+    sameersbn/gitlab:12.7.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:sanitize
+    sameersbn/gitlab:12.7.2 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake db:setup
+    sameersbn/gitlab:12.7.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.0
+docker pull sameersbn/gitlab:12.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e12d94fbf..a028d1437 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.0
+12.7.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ce7b26ab..d53354b9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.0
+    image: sameersbn/gitlab:12.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bd33a7661..bc9ba956d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.6.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.6.4
+docker pull sameersbn/gitlab:12.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.6.4
+sameersbn/gitlab:12.7.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 49c4b8a14..b1c3601b2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.0
+        image: sameersbn/gitlab:12.7.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 50a60c0dc3e63b3c4d9ecf49ed20963a3dd0d9d5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:07:48 +0100
Subject: [PATCH 0405/1124] release 12.7.2


From a5ff0f8476e10295eab6bed1d2b0e48d4acb4d77 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Jan 2020 19:36:12 +0100
Subject: [PATCH 0406/1124] Update gitlab-workhorse to 8.20.0

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

diff --git a/Dockerfile b/Dockerfile
index 8bcdda7d4..20c839717 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.6 \
     GITLAB_SHELL_VERSION=11.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.19.0 \
+    GITLAB_WORKHORSE_VERSION=8.20.0 \
     GITLAB_PAGES_VERSION=1.14.0 \
     GITALY_SERVER_VERSION=1.83.0 \
     GITLAB_USER="git" \

From 8fceba8a3312692f1660f2e1108047c62a65b5cf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Jan 2020 19:37:32 +0100
Subject: [PATCH 0407/1124] Update gitlab-pages to 1.15.0

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

diff --git a/Dockerfile b/Dockerfile
index 20c839717..03cc673a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.13.6 \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.20.0 \
-    GITLAB_PAGES_VERSION=1.14.0 \
+    GITLAB_PAGES_VERSION=1.15.0 \
     GITALY_SERVER_VERSION=1.83.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From a4fa78e614010ad7854072a0426ff34f0310e3a5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Jan 2020 19:38:36 +0100
Subject: [PATCH 0408/1124] Update gitaly to 1.85.0

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

diff --git a/Dockerfile b/Dockerfile
index 03cc673a7..1025d5190 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.20.0 \
     GITLAB_PAGES_VERSION=1.15.0 \
-    GITALY_SERVER_VERSION=1.83.0 \
+    GITALY_SERVER_VERSION=1.85.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 5dfc373e4f404e7bf2d01c871d35236d80c169f4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Jan 2020 19:40:39 +0100
Subject: [PATCH 0409/1124] Update golang to 1.13.7

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

diff --git a/Dockerfile b/Dockerfile
index 1025d5190..81a133cf0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG VERSION=12.7.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.13.6 \
+    GOLANG_VERSION=1.13.7 \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.20.0 \
     GITLAB_PAGES_VERSION=1.15.0 \

From 25c93daf1e4622bc4c9adcbb06bc1df110b147a3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Jan 2020 19:46:28 +0100
Subject: [PATCH 0410/1124] Upgrade GitLab CE to 12.7.4

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  7 +++++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ef6e53bf1..9942e0e9e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.4**
+- Upgrade GitLab CE to 12.7.4
+- Update golang to 1.13.7
+- Update gitlab-pages to 1.15.0
+- Update gitlab-workhorse to 8.20.0
+- Update gitaly to 1.85.0
+
 **12.7.2**
 - Upgrade GitLab CE to 12.7.2
 
diff --git a/Dockerfile b/Dockerfile
index 81a133cf0..d987f8a84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.2
+ARG VERSION=12.7.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 2e6562692..a6f3ecbc5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.2
+# sameersbn/gitlab:12.7.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.2
+docker pull sameersbn/gitlab:12.7.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.2
+ sameersbn/gitlab:12.7.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.2
+    sameersbn/gitlab:12.7.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:sanitize
+    sameersbn/gitlab:12.7.4 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake db:setup
+    sameersbn/gitlab:12.7.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.2
+docker pull sameersbn/gitlab:12.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a028d1437..d058e726c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.2
+12.7.4
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d53354b9c..fb449c280 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.2
+    image: sameersbn/gitlab:12.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bc9ba956d..d6f4a19d9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.2
+docker pull sameersbn/gitlab:12.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.2
+sameersbn/gitlab:12.7.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b1c3601b2..034a8f032 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.2
+        image: sameersbn/gitlab:12.7.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 610fad5e2c88d87e752d2b9e6b8f13dad4bd1db5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:39:09 +0100
Subject: [PATCH 0411/1124] release 12.7.4


From bc16c90966ea0c39cc454490490e3808c0a5fa39 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:40:11 +0100
Subject: [PATCH 0412/1124] Upgrade GitLab CE to 12.7.5

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9942e0e9e..f39f93fcc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.5**
+- gitlab: upgrade CE to v12.7.5
+
 **12.7.4**
 - Upgrade GitLab CE to 12.7.4
 - Update golang to 1.13.7
diff --git a/Dockerfile b/Dockerfile
index d987f8a84..6d6992925 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.4
+ARG VERSION=12.7.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index a6f3ecbc5..0b2919122 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.4
+# sameersbn/gitlab:12.7.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.4
+docker pull sameersbn/gitlab:12.7.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.4
+ sameersbn/gitlab:12.7.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.4
+    sameersbn/gitlab:12.7.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:sanitize
+    sameersbn/gitlab:12.7.5 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake db:setup
+    sameersbn/gitlab:12.7.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.4
+docker pull sameersbn/gitlab:12.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index d058e726c..655a6e1fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.4
\ No newline at end of file
+12.7.5
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index fb449c280..6cdae30cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.4
+    image: sameersbn/gitlab:12.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d6f4a19d9..b154810f1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.4
+docker pull sameersbn/gitlab:12.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.4
+sameersbn/gitlab:12.7.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 034a8f032..421c036bf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.4
+        image: sameersbn/gitlab:12.7.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 4f8e75d4f0b4f8f027c55217f3220a9cf6d87ac0 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:40:20 +0100
Subject: [PATCH 0413/1124] Update gitlab-pages to 1.12.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6d6992925..27a9db89e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.13.7 \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.20.0 \
-    GITLAB_PAGES_VERSION=1.15.0 \
+    GITLAB_PAGES_VERSION=1.12.0 \
     GITALY_SERVER_VERSION=1.85.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 8aabea229ee2c27c164958a39a164760ce16b866 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:40:20 +0100
Subject: [PATCH 0414/1124] Update gitaly to 1.83.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 27a9db89e..6dab5e43a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.20.0 \
     GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.85.0 \
+    GITALY_SERVER_VERSION=1.83.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 2f9d7c5596378694a96b62a261d2d76ba21417e0 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 1 Feb 2020 17:41:30 +0100
Subject: [PATCH 0415/1124] release 12.7.5


From 996d25701004977a1ca59c3d86c6fa6c98199277 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 14 Feb 2020 14:30:29 +0100
Subject: [PATCH 0416/1124] Upgrade GitLab CE to 12.7.6

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f39f93fcc..3fcf8cc41 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.6**
+- gitlab: upgrade CE to v12.7.6
+
 **12.7.5**
 - gitlab: upgrade CE to v12.7.5
 
diff --git a/Dockerfile b/Dockerfile
index 6dab5e43a..a3b306fab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.5
+ARG VERSION=12.7.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 0b2919122..d23bc6296 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.5
+# sameersbn/gitlab:12.7.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.5
+docker pull sameersbn/gitlab:12.7.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.5
+ sameersbn/gitlab:12.7.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.5
+    sameersbn/gitlab:12.7.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:sanitize
+    sameersbn/gitlab:12.7.6 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake db:setup
+    sameersbn/gitlab:12.7.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.5
+docker pull sameersbn/gitlab:12.7.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 655a6e1fb..e6954e935 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.5
\ No newline at end of file
+12.7.6
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6cdae30cc..a9209cbcd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.5
+    image: sameersbn/gitlab:12.7.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b154810f1..9292afdd5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.5
+docker pull sameersbn/gitlab:12.7.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.5
+sameersbn/gitlab:12.7.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 421c036bf..047383286 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.5
+        image: sameersbn/gitlab:12.7.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 4f0895fa2255f9dd8cb32315d2b3b4f24b8a0fad Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 19 Feb 2020 22:01:38 +0100
Subject: [PATCH 0417/1124] release 12.7.6


From dcf9e258fe4c5152a1a445ef39cdef0f6e439343 Mon Sep 17 00:00:00 2001
From: Benoit Ratte <bratte@eidosmontreal.com>
Date: Thu, 20 Feb 2020 13:34:35 -0500
Subject: [PATCH 0418/1124] fix: test image curl uses ipv4 only

* Despite the command running with --retry-connrefused, connections with ipv6 are not retried because it returns EADDRNOTAVAIL instead of ECONNREFUSED

Reference: https://github.com/appropriate/docker-curl/issues/5
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f8fef58e1..e7a542350 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ jobs:
           name: Testing image
           command: |
             docker run --network container:$(docker-compose ps -q gitlab) \
-              appropriate/curl --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
+              appropriate/curl --ipv4 --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
 
       - run:
           name: Generate docker build image cache

From be2d9a870f93b4831642236e5b9cc2d8cc62e177 Mon Sep 17 00:00:00 2001
From: Kashif Saadat <kashifsaadat@gmail.com>
Date: Mon, 2 Mar 2020 16:46:22 +0000
Subject: [PATCH 0419/1124] Allow modifying the sshd listen port

---
 README.md                   | 3 ++-
 assets/runtime/env-defaults | 5 +++--
 assets/runtime/functions    | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d23bc6296..6e3b0cd89 100644
--- a/README.md
+++ b/README.md
@@ -864,7 +864,8 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_BACKUP_TIME` | Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`. |
 | `GITLAB_BACKUP_SKIP` | Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) |
 | `GITLAB_SSH_HOST` | The ssh host. Defaults to **GITLAB_HOST**. |
-| `GITLAB_SSH_PORT` | The ssh port number. Defaults to `22`. |
+| `GITLAB_SSH_LISTEN_PORT` | The ssh port for SSHD to listen on. Defaults to `22` |
+| `GITLAB_SSH_PORT` | The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. |
 | `GITLAB_RELATIVE_URL_ROOT` | The relative url of the GitLab server, e.g. `/git`. No default. |
 | `GITLAB_TRUSTED_PROXIES` | Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. |
 | `GITLAB_REGISTRY_ENABLED` | Enables the GitLab Container Registry. Defaults to `false`. |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 38a78608d..b75f44aff 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -26,7 +26,8 @@ fi
 ## SSH
 GITLAB_SSH_HOST=${GITLAB_SSH_HOST:-$GITLAB_HOST}
 GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-$GITLAB_SHELL_SSH_PORT} # for backwards compatibility
-GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
+GITLAB_SSH_LISTEN_PORT=${GITLAB_SSH_LISTEN_PORT:-22}
+GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-$GITLAB_SSH_LISTEN_PORT}
 
 NGINX_HSTS_ENABLED=${NGINX_HSTS_ENABLED:-$GITLAB_HTTPS_HSTS_ENABLED} # backward compatibility
 NGINX_HSTS_ENABLED=${NGINX_HSTS_ENABLED:-true}
@@ -89,7 +90,7 @@ GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
 
 GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}
 
-# OBJECTSTORE 
+# OBJECTSTORE
 GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
 AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
 AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 573b98923..b890d90e9 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1473,12 +1473,17 @@ generate_ssh_host_keys() {
   chmod 0644 ${GITLAB_DATA_DIR}/ssh/*.pub
 }
 
+update_ssh_listen_port() {
+  sed -i "s|#Port 22|Port ${GITLAB_SSH_LISTEN_PORT}|g" /etc/ssh/sshd_config
+}
+
 initialize_system() {
   map_uidgid
   initialize_logdir
   initialize_datadir
   update_ca_certificates
   generate_ssh_host_keys
+  update_ssh_listen_port
   install_configuration_templates
   rm -rf /var/run/supervisor.sock
 }
@@ -1573,6 +1578,7 @@ configure_gitlab() {
     GITLAB_RELATIVE_URL_ROOT \
     GITLAB_HTTPS \
     GITLAB_SSH_HOST \
+    GITLAB_SSH_LISTEN_PORT \
     GITLAB_SSH_PORT \
     GITLAB_SIGNUP_ENABLED \
     GITLAB_IMPERSONATION_ENABLED \

From c63121c99ccd58bf800399ae0553c0c3fe0b1ae6 Mon Sep 17 00:00:00 2001
From: Alessandro Trisolini <alessandro@unumotors.com>
Date: Thu, 5 Mar 2020 09:20:53 +0100
Subject: [PATCH 0420/1124] Upgrade GitLab CE to 12.7.7

---
 Changelog.md               |  3 +++
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3fcf8cc41..e69f0ca25 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.7.7**
+- Upgrade GitLab CE to 12.7.7
+
 **12.7.6**
 - gitlab: upgrade CE to v12.7.6
 
diff --git a/Dockerfile b/Dockerfile
index a3b306fab..4d8f1a0e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.6
+ARG VERSION=12.7.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index d23bc6296..a736f6ae2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.6
+# sameersbn/gitlab:12.7.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.6
+docker pull sameersbn/gitlab:12.7.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.6
+ sameersbn/gitlab:12.7.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.6
+    sameersbn/gitlab:12.7.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:sanitize
+    sameersbn/gitlab:12.7.7 app:sanitize
 ```
 
 ### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake db:setup
+    sameersbn/gitlab:12.7.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1202,7 +1202,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.6
+docker pull sameersbn/gitlab:12.7.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.7
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index e6954e935..5660ff109 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.6
\ No newline at end of file
+12.7.7
diff --git a/docker-compose.yml b/docker-compose.yml
index a9209cbcd..2948d98f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.6
+    image: sameersbn/gitlab:12.7.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9292afdd5..174df05c3 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.6
+docker pull sameersbn/gitlab:12.7.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.6
+sameersbn/gitlab:12.7.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 047383286..7b483b43e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.6
+        image: sameersbn/gitlab:12.7.7
         env:
         - name: TZ
           value: Asia/Kolkata

From 9ca2ab1018ea5655008f97ef728d61bcff9c4dcd Mon Sep 17 00:00:00 2001
From: tomastzn <33376457+tomastzn@users.noreply.github.com>
Date: Sat, 29 Feb 2020 12:05:02 -0500
Subject: [PATCH 0421/1124] Include note about PostgreSQL version 10

GitLab works fine with version PostgreSQL release 11.x,  however backups will fail because the bundled tools, `postgresql-client-10` and `postgresql-contrib-10` are from release 10.x and they will not work with other releases.
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index a736f6ae2..7e1b36ca7 100644
--- a/README.md
+++ b/README.md
@@ -239,6 +239,10 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 ### PostgreSQL
 
+*NOTE:* PostgreSQL version 10 is highly recommended. 
+
+While the GitLab will most likely work with even latest version of PostgreSQL, it is recommended to use version 10.x.x., because this docker image includes some PostgreSQL tools from release 10. These tools are used for backups and other database maintenance tasks.
+
 #### External PostgreSQL Server
 
 The image also supports using an external PostgreSQL Server. This is also controlled via environment variables.

From 3609e9a6f5b4dadae546e77c58607cdf2c8312b5 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 10 Mar 2020 17:57:57 +0100
Subject: [PATCH 0422/1124] release 12.7.7


From 2ea27eef8139b3be0d7cb13f96fae183c0e6e7c0 Mon Sep 17 00:00:00 2001
From: Bart Joris <BartJoris@users.noreply.github.com>
Date: Thu, 12 Mar 2020 09:05:21 +0100
Subject: [PATCH 0423/1124] Add Generic OAuth2 provider (#2070)

* Add Generic OAuth2 provider

* Add docs to test Keycloak on a local environment

* Update docs for oauth2_generic
---
 README.md                                 |  21 +++
 assets/runtime/config/gitlabhq/gitlab.yml |  21 +++
 assets/runtime/env-defaults               |  14 ++
 assets/runtime/functions                  |  24 ++-
 contrib/docker-swarm/docker-compose.yml   |  13 ++
 docs/docker-compose-keycloak.yml          | 180 ++++++++++++++++++++++
 docs/images/keycloak-admin-acc.png        | Bin 0 -> 58209 bytes
 docs/images/keycloak-client-creation.png  | Bin 0 -> 30187 bytes
 docs/images/keycloak-client-creation2.png | Bin 0 -> 103961 bytes
 docs/images/keycloak-client.png           | Bin 0 -> 82477 bytes
 docs/images/keycloak-gitlab-login.png     | Bin 0 -> 64875 bytes
 docs/images/keycloak-home.png             | Bin 0 -> 130397 bytes
 docs/images/keycloak-secret.png           | Bin 0 -> 31083 bytes
 docs/images/keycloak-users.png            | Bin 0 -> 52223 bytes
 docs/keycloak-idp.md                      |  65 ++++++++
 15 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 docs/docker-compose-keycloak.yml
 create mode 100644 docs/images/keycloak-admin-acc.png
 create mode 100644 docs/images/keycloak-client-creation.png
 create mode 100644 docs/images/keycloak-client-creation2.png
 create mode 100644 docs/images/keycloak-client.png
 create mode 100644 docs/images/keycloak-gitlab-login.png
 create mode 100644 docs/images/keycloak-home.png
 create mode 100644 docs/images/keycloak-secret.png
 create mode 100644 docs/images/keycloak-users.png
 create mode 100644 docs/keycloak-idp.md

diff --git a/README.md b/README.md
index 7e1b36ca7..adead22f2 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@
         - [SAML](#saml)
         - [Crowd](#crowd)
         - [Microsoft Azure](#microsoft-azure)
+        - [Generic OAuth2](#Generic-OAuth2)
     - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
@@ -671,6 +672,14 @@ Once you have the Client ID, Client secret and Tenant ID generated, configure th
 
 For example, if your Client ID is `xxx`, the Client secret is `yyy` and the Tenant ID is `zzz`, then adding `--env 'OAUTH_AZURE_API_KEY=xxx' --env 'OAUTH_AZURE_API_SECRET=yyy' --env 'OAUTH_AZURE_TENANT_ID=zzz'` to the docker run command enables support for Microsoft Azure OAuth.
 
+#### Generic OAuth2
+
+To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure.
+
+As an example this code has been tested with Keycloak, with the following variables: `OAUTH2_GENERIC_APP_ID`, `OAUTH2_GENERIC_APP_SECRET`, `OAUTH2_GENERIC_CLIENT_SITE`, `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`, `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`, `OAUTH2_GENERIC_CLIENT_TOKEN_URL`, `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`, `OAUTH2_GENERIC_ID_PATH`, `OAUTH2_GENERIC_USER_UID`, `OAUTH2_GENERIC_USER_NAME`, `OAUTH2_GENERIC_USER_EMAIL`, `OAUTH2_GENERIC_NAME`,
+
+See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details.
+
 ### Gitlab Pages
 
 Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`.
@@ -1038,6 +1047,18 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_AZURE_API_KEY` | Azure Client ID. No defaults. |
 | `OAUTH_AZURE_API_SECRET` | Azure Client secret. No defaults. |
 | `OAUTH_AZURE_TENANT_ID` | Azure Tenant ID. No defaults. |
+| `OAUTH2_GENERIC_APP_ID` | Your OAuth2 App ID. No defaults. |
+| `OAUTH2_GENERIC_APP_SECRET` | Your OAuth2 App Secret. No defaults. |
+| `OAUTH2_GENERIC_CLIENT_SITE` | The OAuth2 generic client site. No defaults |
+| `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` | The OAuth2 generic client user info url. No defaults |
+| `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` | The OAuth2 generic client authorize url. No defaults |
+| `OAUTH2_GENERIC_CLIENT_TOKEN_URL` | The OAuth2 generic client token url. No defaults|
+| `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` | The OAuth2 generic client end session endpoint. No defaults |
+| `OAUTH2_GENERIC_ID_PATH` | The OAuth2 generic id path. No defaults |
+| `OAUTH2_GENERIC_USER_UID` | The OAuth2 generic user id path. No defaults |
+| `OAUTH2_GENERIC_USER_NAME` | The OAuth2 generic user name. No defaults |
+| `OAUTH2_GENERIC_USER_EMAIL` | The OAuth2 generic user email. No defaults |
+| `OAUTH2_GENERIC_NAME` | The name of your OAuth2 provider. No defaults |
 | `GITLAB_GRAVATAR_ENABLED` | Enables gravatar integration. Defaults to `true`. |
 | `GITLAB_GRAVATAR_HTTP_URL` | Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html). |
 | `GITLAB_GRAVATAR_HTTPS_URL` | Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index e43c58db9..c0dc782e7 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -571,6 +571,27 @@ production: &base
             client_secret: '{{OAUTH_AUTH0_CLIENT_SECRET}}',
             domain: '{{OAUTH_AUTH0_DOMAIN}}',
             scope: '{{OAUTH_AUTH0_SCOPE}}'  } }
+      - { name: 'oauth2_generic',
+          app_id: '{{OAUTH2_GENERIC_APP_ID}}',
+          app_secret: '{{OAUTH2_GENERIC_APP_SECRET}}',
+          args: {
+            client_options: {
+              site: '{{OAUTH2_GENERIC_CLIENT_SITE}}',
+              user_info_url: '{{OAUTH2_GENERIC_CLIENT_USER_INFO_URL}}',
+              authorize_url: '{{OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL}}',
+              token_url: '{{OAUTH2_GENERIC_CLIENT_TOKEN_URL}}',
+              end_session_endpoint: '{{OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT}}',
+                        },
+            user_response_structure: {
+            id_path: '{{OAUTH2_GENERIC_ID_PATH}}',
+            attributes: {
+              uid: '{{OAUTH2_GENERIC_USER_UID}}',
+              name: '{{OAUTH2_GENERIC_USER_NAME}}',
+              email: '{{OAUTH2_GENERIC_USER_EMAIL}}'
+              }
+            },
+            name: '{{OAUTH2_GENERIC_NAME}}'
+          }}
       - { name: 'azure_oauth2',
           args: {
             client_id: '{{OAUTH_AZURE_API_KEY}}',
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 38a78608d..4dcd3976f 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -432,6 +432,20 @@ OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout}
 ### AUTH0
 OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE:-openid profile email}
 
+## OAUTH2 GENERIC
+OAUTH2_GENERIC_APP_ID=${OAUTH2_GENERIC_APP_ID:-}
+OAUTH2_GENERIC_APP_SECRET=${OAUTH2_GENERIC_APP_SECRET:-}
+OAUTH2_GENERIC_CLIENT_SITE=${OAUTH2_GENERIC_CLIENT_SITE:-}
+OAUTH2_GENERIC_CLIENT_USER_INFO_URL=${OAUTH2_GENERIC_CLIENT_USER_INFO_URL:-}
+OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=${OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL:-}
+OAUTH2_GENERIC_CLIENT_TOKEN_URL=${OAUTH2_GENERIC_CLIENT_TOKEN_URL:-}
+OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=${OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT:-}
+OAUTH2_GENERIC_ID_PATH=${OAUTH2_GENERIC_ID_PATH:-}
+OAUTH2_GENERIC_USER_UID=${OAUTH2_GENERIC_USER_UID:-}
+OAUTH2_GENERIC_USER_NAME=${OAUTH2_GENERIC_USER_NAME:-}
+OAUTH2_GENERIC_USER_EMAIL=${OAUTH2_GENERIC_USER_EMAIL:-}
+OAUTH2_GENERIC_NAME=${OAUTH2_GENERIC_NAME:-}
+
 ## ANALYTICS
 
 ### GOOGLE
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 573b98923..eb37c4571 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -595,6 +595,27 @@ gitlab_configure_oauth_saml() {
   fi
 }
 
+gitlab_configure_oauth2_generic() {
+  if [[ -n ${OAUTH2_GENERIC_APP_ID} && \
+        -n ${OAUTH2_GENERIC_APP_SECRET} ]]; then
+    echo "Configuring gitlab::oauth::generic..."
+    OAUTH_ENABLED=${OAUTH_ENABLED:-true}
+    update_template ${GITLAB_CONFIG} \
+    OAUTH2_GENERIC_APP_ID \
+    OAUTH2_GENERIC_APP_SECRET \
+    OAUTH2_GENERIC_CLIENT_SITE \
+    OAUTH2_GENERIC_CLIENT_USER_INFO_URL \
+    OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL \
+    OAUTH2_GENERIC_CLIENT_TOKEN_URL \
+    OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT \
+    OAUTH2_GENERIC_ID_PATH \
+    OAUTH2_GENERIC_USER_UID \
+    OAUTH2_GENERIC_USER_NAME \
+    OAUTH2_GENERIC_USER_EMAIL \
+    OAUTH2_GENERIC_NAME
+  fi
+}
+
 gitlab_configure_oauth_crowd() {
   if [[ -n ${OAUTH_CROWD_SERVER_URL} && \
         -n ${OAUTH_CROWD_APP_NAME} && \
@@ -654,6 +675,7 @@ gitlab_configure_oauth() {
   gitlab_configure_oauth_gitlab
   gitlab_configure_oauth_bitbucket
   gitlab_configure_oauth_saml
+  gitlab_configure_oauth2_generic
   gitlab_configure_oauth_crowd
   gitlab_configure_oauth_auth0
   gitlab_configure_oauth_azure
@@ -668,7 +690,7 @@ gitlab_configure_oauth() {
     OAUTH_EXTERNAL_PROVIDERS
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
-    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2)
+    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|oauth2_generic)
       update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER
       ;;
     *)
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 78fc43275..3e83e3262 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -151,6 +151,19 @@ services:
     - OAUTH_AUTH0_DOMAIN=
     - OAUTH_AUTH0_SCOPE=
 
+    - OAUTH2_GENERIC_APP_ID=
+    - OAUTH2_GENERIC_APP_SECRET=
+    - OAUTH2_GENERIC_CLIENT_SITE=
+    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=
+    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=
+    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=
+    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=
+    - OAUTH2_GENERIC_ID_PATH=
+    - OAUTH2_GENERIC_USER_UID=
+    - OAUTH2_GENERIC_USER_NAME=
+    - OAUTH2_GENERIC_USER_EMAIL=
+    - OAUTH2_GENERIC_NAME=
+
     - OAUTH_AZURE_API_KEY=
     - OAUTH_AZURE_API_SECRET=
     - OAUTH_AZURE_TENANT_ID=
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
new file mode 100644
index 000000000..54031cdc1
--- /dev/null
+++ b/docs/docker-compose-keycloak.yml
@@ -0,0 +1,180 @@
+version: '2'
+
+services:
+  redis:
+    restart: always
+    image: sameersbn/redis:4.0.9-2
+    command:
+    - --loglevel warning
+    volumes:
+    - redis-data:/var/lib/redis:Z
+
+  postgresql:
+    restart: always
+    image: sameersbn/postgresql:10-2
+    volumes:
+    - postgresql-data:/var/lib/postgresql:Z
+    environment:
+    - DB_USER=gitlab
+    - DB_PASS=password
+    - DB_NAME=gitlabhq_production
+    - DB_EXTENSION=pg_trgm
+
+  gitlab:
+    restart: always
+    image: nuberabe/docker-gitlab:12.7.0
+    depends_on:
+    - redis
+    - postgresql
+    ports:
+    - "10080:80"
+    - "10022:22"
+    volumes:
+    - gitlab-data:/home/git/data:Z
+    environment:
+    - DEBUG=false
+
+    - DB_ADAPTER=postgresql
+    - DB_HOST=postgresql
+    - DB_PORT=5432
+    - DB_USER=gitlab
+    - DB_PASS=password
+    - DB_NAME=gitlabhq_production
+
+    - REDIS_HOST=redis
+    - REDIS_PORT=6379
+
+    - TZ=Asia/Kolkata
+    - GITLAB_TIMEZONE=Kolkata
+
+    - GITLAB_HTTPS=false
+    - SSL_SELF_SIGNED=false
+
+    - GITLAB_HOST='<your-ip-address>'
+    - GITLAB_PORT=10080
+    - GITLAB_SSH_PORT=10022
+    - GITLAB_RELATIVE_URL_ROOT=
+    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+
+    - GITLAB_ROOT_PASSWORD=<root-password>
+    - GITLAB_ROOT_EMAIL=
+
+    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+    - GITLAB_NOTIFY_PUSHER=false
+
+    - GITLAB_EMAIL=notifications@example.com
+    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+    - GITLAB_BACKUP_SCHEDULE=daily
+    - GITLAB_BACKUP_TIME=01:00
+
+    - SMTP_ENABLED=false
+    - SMTP_DOMAIN=www.example.com
+    - SMTP_HOST=smtp.gmail.com
+    - SMTP_PORT=587
+    - SMTP_USER=mailer@example.com
+    - SMTP_PASS=password
+    - SMTP_STARTTLS=true
+    - SMTP_AUTHENTICATION=login
+
+    - IMAP_ENABLED=false
+    - IMAP_HOST=imap.gmail.com
+    - IMAP_PORT=993
+    - IMAP_USER=mailer@example.com
+    - IMAP_PASS=password
+    - IMAP_SSL=true
+    - IMAP_STARTTLS=false
+
+    - OAUTH_ENABLED=true
+    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
+    - OAUTH_ALLOW_SSO=Keycloak
+    - OAUTH_BLOCK_AUTO_CREATED_USERS=false
+    - OAUTH_AUTO_LINK_LDAP_USER=false
+    - OAUTH_AUTO_LINK_SAML_USER=false
+    - OAUTH_EXTERNAL_PROVIDERS=Keycloak
+
+    - OAUTH_CAS3_LABEL=cas3
+    - OAUTH_CAS3_SERVER=
+    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+    - OAUTH_CAS3_LOGIN_URL=/cas/login
+    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+    - OAUTH_GOOGLE_API_KEY=
+    - OAUTH_GOOGLE_APP_SECRET=
+    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+    - OAUTH_FACEBOOK_API_KEY=
+    - OAUTH_FACEBOOK_APP_SECRET=
+
+    - OAUTH_TWITTER_API_KEY=
+    - OAUTH_TWITTER_APP_SECRET=
+
+    - OAUTH_GITHUB_API_KEY=
+    - OAUTH_GITHUB_APP_SECRET=
+    - OAUTH_GITHUB_URL=
+    - OAUTH_GITHUB_VERIFY_SSL=
+
+    - OAUTH_GITLAB_API_KEY=
+    - OAUTH_GITLAB_APP_SECRET=
+
+    - OAUTH_BITBUCKET_API_KEY=
+    - OAUTH_BITBUCKET_APP_SECRET=
+
+    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+    - OAUTH_SAML_IDP_SSO_TARGET_URL=
+    - OAUTH_SAML_ISSUER=
+    - OAUTH_SAML_LABEL="Our SAML Provider"
+    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+    - OAUTH_SAML_GROUPS_ATTRIBUTE=
+    - OAUTH_SAML_EXTERNAL_GROUPS=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+    - OAUTH_CROWD_SERVER_URL=
+    - OAUTH_CROWD_APP_NAME=
+    - OAUTH_CROWD_APP_PASSWORD=
+
+    - OAUTH_AUTH0_CLIENT_ID=
+    - OAUTH_AUTH0_CLIENT_SECRET=
+    - OAUTH_AUTH0_DOMAIN=
+    - OAUTH_AUTH0_SCOPE=
+
+    - OAUTH_AZURE_API_KEY=
+    - OAUTH_AZURE_API_SECRET=
+    - OAUTH_AZURE_TENANT_ID=
+
+    - OAUTH2_GENERIC_APP_ID=git
+    - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
+    - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
+    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
+    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
+    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
+    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
+    - OAUTH2_GENERIC_ID_PATH=sub
+    - OAUTH2_GENERIC_USER_UID=sub
+    - OAUTH2_GENERIC_USER_NAME=preferred_username
+    - OAUTH2_GENERIC_USER_EMAIL=email
+    - OAUTH2_GENERIC_NAME=Keycloak
+
+  keycloak:
+    restart: always
+    image: jboss/keycloak:8.0.1
+    ports:
+    - "10081:8080"
+    environment:
+    - DEBUG=false
+    - KEYCLOAK_PASSWORD=admin
+    - KEYCLOAK_USER=admin
+
+volumes:
+  redis-data:
+  postgresql-data:
+  gitlab-data:
\ No newline at end of file
diff --git a/docs/images/keycloak-admin-acc.png b/docs/images/keycloak-admin-acc.png
new file mode 100644
index 0000000000000000000000000000000000000000..116967254c3ab1f20c994363ea7c7bdaa63dcdd0
GIT binary patch
literal 58209
zcmeFYXIRrq(+3PFpdg?~5s+d5q^tA}f}r%?AxITM?==xn5D`!ikQzGDrT3-+(tC$Q
zdhdjg{>Jm%&;6X^`SgB#uj|c+T*?0bJF_!8GdsKU+h`pvRVoT*3L+vRs^`y?^@xZr
zVTp)HUR)s~wA|bq-6JBR`01pir1M-!i9^TB-NDJlo`~pKbW#erL1G`nt4%!q><Q&-
z>Kt*!pd{KLq5@-<J6G?2x<woQj_PAKy@{@Y@>hO)UFEJiqH2a8;cuQ+y?}AVylWO@
zaQV{89`JezF&uo@n(jRk($wUAm?<gj?M9SMJ9}4`tL(Bu@<Y|z^lJmpo@v<p0+U}K
zy>#E2nt$$g^joGIH^_8S+3<pg?s?EJi(j+e!Vf#}#=09P_iqzrU-_ipNUO!ruc{l`
zeIweNNMT2}Wo-QR*kypSso{Huw<i%-wbEBUUe!vqyXG*?&DBq1PepWvPRu-mjHvro
zov@dr)63iM<ooNNR4BZCjA9M&yl@fhe`)oQj}O>)c|b=@8>yaA+tID@vDdC<Vojzl
z`T3m-%KNz*=O=h?X<UPyy;_m?=Ulbrn25a5k8uZcneRDsych}xDIpHT{^Q^T<oK^y
zr;TTrgu>K;bDE@)p$tZ`q2h3bWEm}LK8LixgjZWm3_{Tfn`-pvM@6XuS$%v%Z<7{~
zGRZO^HhC^knm4KEX`yMt4OXeuRqlqE0^Ji-;5QCfYHQd@o#S&{wH2|toOl%bO@4rM
za3Lt`gXB&91dhtsfm52#$I(gX7_X4^Cgs!{USKPS4~v3*vB@JtiZpA3i&v0rg*8fd
z3z;q=h^|M1ZgDV35UE;|FA_BiOSanIbfmiwxFNtuIesB|jVov%;9BwrTj7`&?m&0S
z&L5eXQnc=e8qlY2wLVuxk6yTKrK;{YxbT<})#hwIOO&t`hEl$=At5S9-Y%B#?-%pT
zBw`4?N*BgEstmh)?@aS6*?A{Z01<ob%Ju8iHVSu5E=#<kseW~fpOml5Oy{y%C)Zah
zgD}}_>b*<kT`xw-v|b7SB55S42s8gB_aW@g5y|^k2<vO%95TvpUVh-pr%6>X`XIYT
z5vWM4bBm6Y^GTl$^ZnQPqiQc%4M>ud40Wg`uVAmSMhz>ZWXo*{iV#sLxo3|&B+<7v
zG+`8b<M_Se;Z5o{w!hwZFlSJ0cD*@LX{4=qL(^G)#B@OsLYdqp^h@_Lhu!PATO8AG
z`BtJ{-+TUy_pXZ3z3ykEdNCsRSf7b|UHW)O=%e<n+mVqktjiv;eYV!%kBsQ+DeL)U
zQ}Ph~u>7<4XO_>zgI6|KlHW~rnY~!5;&&ktqiUfue_h@wW*z@x#Mb>q)Yn5#iQBA>
zk=|XTtF)fmjr5Iri-H!E6*p(1SboH=90zE&(nD{u$2qQgA3eQby|{ESaj|=G2ct@o
znyvkn`!a39l_yV#bHcwuJl=U^9({VKVsJO@`cm|=vY@AA)q4}|Jq{~Q>Knb!`tJ)T
zaPvfd(lS#oxi6YHoXGY8n$TybRLvrpz|XOn$k!M3ld<p8nl>H%JI?O->Q{FQT=Mq{
zeDn_VpnAmy`Xw}?(P>Ic&s_7f3gmJ@2H8Bb55CehQUK{n=*{RW_*(Vu^QJv`OwY)(
z!DIA*O}Dk=LNEG@UCCO}4<oa3gK{5>Vt|uDYN1Qf?TU;7i;`9VGT}s+zV%(P+A9j<
z0-XY_^|F2rsvM><%*)&JQf9LIGOo|)i<}Gl^)!tIbY;KHmrCUp=5BmpD5}>eH`~uo
zdmlHdxy>KM)%G6r8I+DQwKUEw9@d9tL(4#x*oesb$apgCJd?bqtI0i%nvo8#93nRy
zhQx-V%x(#&mp>~nFl(tB2DVKaO`VT!ykrEjPq!Cc+BMlx-Yy$0p4c8^nwpxR8mHer
z7?mwW>%~`W=A~3L7#@CtewEXNsROb*4Dq!%??~o|zMpmmkB1+rT=TgWPL)q4O4deZ
z8|e^P6-gQ?5J?mJOr=7lSj9ZH`Mt_}c<d%~rHI?(cE=|oo}$a?F5=r_NNZ;YX7^@j
z?a*0jY9!MD|43QiUYO+6;)2XV>olg2bokrU-S0Lj-J<HV<9!M4rmlfg6!l*9v?lx2
zJLzvS*TvK&O8tyFM7z_RGJ#8WverrsS8I5_I@JV<E(G|E?+w+oID%_@tA}dK8`|89
zY#42ft!G{!dZ6Q3wg6Y~MA**tt*<>fOUre6N%uxP8&+Al(<Us6;98bifK1Db?%|=~
z?}9yoeS*@KC`&`jdlu@JLd`FhLYAf*Gd<922YXqopjoUo4KV&%JeF-_<MYt+P%%V!
z%W13cyzKZ>;G@=rHqco@AWJ|^8?cQXeGBOk${dpQSm5*a;H5$1_WE`km~A^dW)W+I
z^hMpnDdM_uZN$99Rm6tG@g!82CP>mrRKqjEjV}9=*+wWuh?65~d`xc}-2>kL!D(ms
zvq?worO!*lt<{GE4?RtKEdtzrE(&<F4+^JpXUs5Ae=}V+|HiKJ`Kg^MhBi9p{oAs*
z5L$c2y2mBbX$)-=LEtm=E!gMk&*-X+s`1$hiS9;H&sb0P73}K3s{PfPn?{@#&nMOB
z?$>iKC$1zgC#Y<a55mO2FT*Cnb4eQ*(*!K)kH+toKTVC%5;U?Hv<kV;lzto1DvzX;
z&afO{(|l2|r@^#*;aTr(<q_Iw-t=8Y+e-4#sl?GaaHmFOq*lP`dx$%T6kpJ(t-~3R
z$(GU1ja5<!=z+dJ9=sS#=6_=3HSL-6?x9kETQoGmULB=ulzaCh|AK6=`T1K3gGG+8
z`;?sfk|i&_C+~@-fVf$I!u!jIv5g{b+aK-w2VM^ZC7TPvzG9rLtfAU`5BVhcnvIyt
zELyy*>AekyoL~C(?^KAY04Zj!t&^`GnyZ_oSDnw0EQFtg`|qyI_|ok#Y%o%T7|$&A
zKR)@`_yye7i;^YG7h?#lrR&A_I4an?rtTDV7j<5>_D^1FLU?P0(mKs5i@x}IvSi9W
z^!391MW5gr#75|P|9aqhg!zV>(^CJeSu1?0zI#E?P{L?$PHSFpNwD-<sSE5ytL;Rb
zkRhhTe5!p)K-$;OZ5H{0(SHWMB-fIT*gD{uJ4LE?#rr#lJDUMDfqXk2zD>T`JF7b_
zU@vTOm11d5{_?KXvejJsm(WdSOJ)|t?w$}ZJUw6YJ2}JcM!!+Kb#RTZw<cv<!P<3+
z`?6=4%{7QSJGJbh?+^I1Q{BWo>G-iY`i3Xv1Lmsp7p~RkKhE1%@AS4v$w<XvZB7TE
zH_5n5v`aGirJqU}1~_AUpxa|wx|;*SPL5<P4E{^<=^p1BO+UTcHkC#It=9vVUBqk9
zXHQ3BxCNU4QlL4w*8=?}U%9N7Y%j<c1vjbmcHcEjDczr0tnfV>+LrcRLZebyaN>fC
zc1x{ZKxldULRG`znb20s(lRvAPyF;?H@FGWbFeAjDfa;M<?QRq$Kkwr7(WR3QF1_w
z`hw<6CJqz={vdp@;@@`&h@^n%Kn!H2!1EV_xVh-%&Sl`praXJlouEhO)mt>{@_y})
z!M<nO5cyygT9rtv7(jdnPiQI9?@+qe-!kt;UOd#1;IcXx-P6@}?FvY<d@mRzRewf_
zQ(rfZsbqyc>5#oO!pzQC)xFneM5IWsrAhjWYMxu?CULgqrB@>0lA<iSmpkCj`(gMW
z`k{z?iAy>&R~0nmh+b?pUSieMH9RBcAep+wP9!by6Aroi-1jTw-BULu^Tc<@#|<x2
zUN;c^0^%<&OcpLKX2@!1gNc0FAv^2b%G*RlqUZI*=P&$E52HIfe##SRfNtofZoj7?
zA|lRmGBEKm(bSN#b$1nfVdrjRFBstJLCATDh-3n!2tQrzeO_<`xVpG`O9jZ@{p$@W
z!tdYBLU%d-dc_AQd)Gu$heOHT%br72P(<+IT{#L44h|VFI|nH}WtIPQC;XGW`_jk9
zLrO@<-``)*Us%xH%Tef&q@<+K!^c989}5uP5bzFk^LY^<;O2ere~A1q9c6oOTQ4UM
zA18M=j^A`&*tq-p$lksCo6&zi|1(be0H^=s<mUY!u?PYR{eB|!NbsT1e`yoC%KUDX
z(s2r~cQH|Ra<zB!Ch(AZ^ziW`nZG*x>(T$Q{99Mk|LZFDQ1b6R|MuiRJ!OP`OYk>|
z{zqMZwG#9tM<FBhU){@5lrp?qCL&TGdakT!5J0@QM4Dk>i0?gSUt+z>aV7knHQ$wI
zdD%8$55n*E*!m-Eapk=SWG#x<m6ab65y#M8&Tnb?jz?y}<NTvi=PYMGo62p%=QC4T
zHnY&}{tgI#X9~=I!pG|hM8uc>{>1^iN;l~5_~YuGS41RNIR5taijiY$Q{`XpLnyAF
zZB9@QIQ`i{VRS_HZ{7c*rXWYpu{Bb}m^|_155BLmA;Et%5ru{DDvUz3h4_o!{4o|H
zMR~-ZO(aNzSK0CqD-$ise~Lsz91c48v+43lF_9uzuI+0E!#~9&BDsuRyz~#r37ppS
ziNkRrK`$f){-G_xh_9fU$p5au-$MK>A`n5Iee*K=lg{-sZ<@a=^|ufov`G{0ZUH(#
zZSaGo1qK1LPui*f=HmshZV1N#K*(;Dc(%5M0;{&5y0(jzn0o83@TFnCylWsl)*oE<
zzTQ^$Pl1XBbpnjFt$X8G&%t;Exc<d=G8PGsY<gaUm&P^yQ`mMK3Wz?N&@K-~92iwt
zG+D^{sgS2jc;*geN{cT!`0h^EU80uYSbA*ruc0%AS-Nc-^WibbQ`hzWq`C2VNa{C-
zUa=^4P@||jbg@5KAf0v29>`X0P)Tm6vgL?8S;zU-v%MbtLuco=epA9@PDjd(%FWo+
zM$$!r$+RzfS^YD%xhoSl9?jOfnm60H%vE>yf8w#FVi7wV5bf<M)J*rIz{Jq;*l?;R
zYcvQ6{XzEnTZY+!Z17yQy_nCIPRm~PKnRFAzS2I4&p2)vTr|TX?sg`7SuKgzKKQV$
z0RYHW2+ORWAfdXW!)x-eT<P08dOnxF1WuzOEml6Gvd;iUTtV`2cMKysgwNp1bu0Qn
z90CST2ZhT-&`Txv-}v;j>wIsn2J2a3T<P{ShJi|KD7n|Y13S$iXmLxpl13i$u-c*m
zj6*uE)n)Cq9Jc#mj(dyDdno_3s$5b(o-KBnfUhG(w!Lw34~<9h>nVWwrp+vtOz;}K
z)@fo7hdylJ(Jxd^F0N}fZ*cQNZ5OE~zkyizFZufY3L{5ZU8a#adNq_P%w3HdRidd2
zK4|Kt`#{4i@)H_zI^?s<BI;~McsGUS!#(LH?!(s8xVGaS7BQFEuRm=JNkm-dC$j=p
zt}e8Pw#cIQYPL_tBR4bsvn&Ia-#p@Dxyy8X`45*0yHESmYqXNVvrf5G8eHc*g(<%6
zJE=R};11Xw%j?w=*qT=m#sEU$Q$~3zRKZ(0Q5uO8uF%#wF6}HAZFy{M@e>ZC@hXwy
ztoC8;zy{#VFt1^W-9(XgLoYjcv7!SPB#m54+)s7Ps)`Y8{%KbG^2Pc<3WA<eDsCEl
zHl}LSc+^qEbjJ49w{^xUc!*0g&CU@LTEFDk%ZkHHS6J@yiJ;E5SGoCG*Amoi_S4qw
zcXYGeFs7LrI&G|zlwq&`2q+3FBzTqYOs>e0AkAMzg69-pB7Am=i%>@JD%;-q8>+W&
z@Sn$1R6{~ep2IltQ^o+e?Q{f{2wxlTwPv4fTK@TM-9%C=&u;qZ8pn~JQifs%<z`dE
zlAE{Lk6?kDnQ|92VxvJ+?4zJOmDp<Acv&%%q$6G8jv%_%y%@eq6nr<m=T~XeD>F<C
zqfpjE$Y9y0#Gb=SvpQbkbk+K?Q8LYQ)jxwM$GtFqax4}FKTZ7UM26ugeq&h-#^a<(
zu@udY!x`HVPNYp^#STMhe*HW}7omAGq?OYC2e)NnWq7aC^z1`CzFqye-gVQE>%maE
zxRA-GW!ttOcv&d={87X1XimiTq9`>W3~|6kr9P??ML2PiQ#W<u@8~&8{L|}xKI2da
z%oROfZ%1yhz#g+_%~mK!(-wAGtfKPFbMUBLAwcAGxp}XEdTuJ7{%wk&rPM~d^ZtxZ
zm<IxT6p8X9PLiy7UVhl63>rgknW(9!2*z5~4OFgX8s}c~w}&VrtEm5JejIoTyW#?X
zVp~G<9`K~qgQBM&cn!zom~q3jpfXdxv#c^TCPhR`-fA9L*|t)CV!Ib%Ei<k1hJyZG
z$R&j`_}D<WBt>q@uJ4g6aoU+sOF|@vo#=kQoT)6?!o7bkV{0^F8su1t9Z{aFae@o8
zAok=5hUuf&(Szrv7);V71e?{36x{*8RwG;^6PL-y1!7;L_#(Ay@Dh$c7s(GyziD+{
z1|guqmD{B#n}P-yXdx^3K=OC|-R3*}BqH6`ekiAF*5GEDJB9Si43dBO`A4#V`D5QW
z)AIX24GLZUFx(IBq>p6_<v(`{jm=`LpR^HQB2(@Zd9jos>CLa(a6#}H)q2=Omfd9H
zojt`-_UT`e|6DH!cArXtinxk7n+l0;uc+`^?=Ms%HoU&YckoFhHEaCyBU_AZ86ZzJ
zKCUhx-Xu9mL5`39a`0s~?&yDd&<7n3eMRuYFhG%3CaptZQpqhH)cJxtHjkHBq!6EE
zY*nS1E{3#U2Apn=G!O!SNbAe^psb{9dA@}M-M1P1e+)|_>{<lQnxrFwTI%N+Jdmk?
z;Nd2O`P-`*kvmOyUPQ%;L$`X7h@Gi{cJzU?d=CJoTggVenc*Fm>DAA}WS{On<5&Qf
z<6GD;f2eis5A&HIVbWR?fAQ_|#5GKch1c`K$5Yo%EnEEH0_e2PO27U2=@LV}-HD=j
z*^{65{00OXluvYNUS-J!r}19;9coA^=-!r1B!-hxq98t$N<y`AL6A{rd=hA$D<c=+
z=x6DX@#|45>_BEjZ8y}Yekt>DmCzpo;;ujV#Wg$7E|fL$I@+NGBJE!RnF4qd?QJ_j
zTLZ;jj%I5-^4T8mCWOUL#jbN#{wV=bm<0{$j<!&?+6Th=R0O!Snbdw&QI_Y~pDBo)
z3L#ArR&$B?=WM-FprFWSKgtT{R`_`1Us+x~Az5-^OuqY1PvH1)LP&IYz*i;z7z^=b
z8_Mfvy?!rv{wX6736BsVr8`OaaP$8oEa>9eB(USi)6IpAq4Wu%HA9Uso9=g}vCN`2
z6}ET&l&*>ALvc2M7`)W%>s@2P6I{k5?2zv=$0PC27Zq@{*}-63b5;h`KOYd0+#uwc
zS4g%06;J`cGs@i{FR?$TQ<;!~-lLOI{3Chh0AD5K<(0dAbARS+*Kcra#p@jXYx%}-
z5@x2Og4^+5hM`O_m?vE~|IATNQV2%z|5Au1hBIx`syQx!g*EU-*_;h{GhsE{*L?qb
zAKyJyAo4&Y7(Culd5<sQtnYnljVl&KHD}hmztFJoA?Lfxz;wAB4C>zDSlJ4dHjn=Z
zc)U>Slo*@-aBM@!<RuuNiS^${vxhp5beuWId1+>fEpg!`IrV#QiEc2q;5HV7>s+ne
zM8I7n>C*05c++aTZ9&WQg@e`^&@DNy6fN7i6MEciy108>6TaWD6oZOo5$~~p+@v%v
zGjWoSyWruj)|!`ro1V{{F^M^y&@Iqyn%#F@K5ewFMtk>*92RZnXWaZO8(e|E7KaG@
zXsH^9Tgb9RCeZwzV}%_`y5VwtiKD6K(yS$cLwe^uSL<By@4EfW7~Q)XYG%wL)Vf^{
z$DgjaCb%Jc!4=iOj#NiWnlfur%FnTY<}ro}ZA!lh*Uzto=q4?KSIeije^C1!ziAs!
z@_=GU3t!bjLB96}Yz1P<uF0By^~jM$tne8DA<TZih|vq*-o#X|vu_-NZn>44v$06&
z?Z_E^z)X4z1*ZSvr=aJx69<6nL}d#-zrJi>x9@m)ys|XR{Zm14<KimVB(X=8G-eMQ
zFIQCuoSDP3waZuYLldV;jTbT`Pglyd($-TfeU+N4Kk=H5Yss$PCu|qIo7bbQ2GeAF
zjmj45C^}Wy!TsbKvdzAAH8!_THx_Wfm=yjhU}f{*e7#%hms@l7Za=j1_NK(4)wb!Z
zwxkq|G%X<+41#8M@v_J7DNP&;r3ZME_!iVhWM4deXLoR@)SQX<z*uTjUayKne8N6L
zj`%o+?DTQZziAuRY~W`C{6M`|@9`?p0Dy%Dp<CFva@di3H+D>w^@abEpMD&jB+5NF
z?)GbqzapKU9>+{LXuEas1$)cUs9L?xcd_(FpTs5EkQ~-uyq9_a9@(rG1<Hj)(uhna
zNR}1%gd)Bm%D6txcL4QDUZ4C~ZfyIlvm|<7d@D5)WsV>D96rp^hQ_JZ8&8#NhvQ5J
z!uP+&qbJLpM&yuRC{e&j#=~jvx_Y_evs2{VEyz*t{T4J7Uy~Ovvv|;UYE)|EDx^P9
z!An9dj~QL^>fg=;-+t6j20|J(X9L1E<5;D=P@_#*czZ^`%l-NK>L%~a)Sw5gh^}6v
zg{6r(Q=Y`J=b_7Gc@em6VF$tp^FnKaLwi>j7H%Bi1`i1-X2l|CrfoXAi}?I(mBxJE
z41HmxK4BSypZDFpdU12nWQWQtbGJ{wTKQ`58UCOSyE{`u@P#>uevw&S+qv3T$CI*m
zaHbTQ0(8UuYS8%`<Fe3&X+K<`ECzN$U}?JiO%ma5tc7vKBi;u@{<X*LCy_+Va7U^s
z&Y%o_Vh#8Vf8cA&EqlnZjv%=KF2H2x;Uo8bBWcG@ewIhzwj^G?Q9-$~1lh@w=JL7L
z@63d=dn0$KTc%v<@{H_wbF*c@GtS_XP0sU4A$3hl<N!UNoiV#<_ko+$(B_Q$4sXk8
z?;ElGl?XrHvB4?xz3D@SS!3au*^Pa$d19OTJXQcv&mgLPSnKL0MA%rSho0^u{HEwr
zW@|<|T;yYMa}B?WZ^z5wYGW^)YKv)q?Yc)b{W`m{P;Eb;H9)s#>HWQYy42BMpY)r1
zM|{mqX*S0qNKo|>2oZV!X-Ai-z}v9Jt_$@`o9F>|+j5<*a6gyRLchMJZ5a6n!j41r
z(uaYaRskqaKI4iq7$_6HiAvzBtV832qlyPsLTTi7QV?5kcKjFc1E4{r+a)rP6Xa~)
z9XMT9mnI6Fg&PChe9z1G8<@mF;Q;YD-ys3r>eqPkvyuV9`jhnmBs>tlyKW3S6KsH;
zxC6b`)#%IL2<z&Rc8ZEG+Ti_ROXq9CLbHSb8!`}U=D~$~H0M79s11lV^w{(Sjj&Cx
z%sPPNsc1%ZC=6FzmYS!SMWueeQ^sEU(h3PcNg8)OoO;K|=fD~Vbd(+0b|766y&4xh
zl$0{J+XfReti9a`4wW9N^C-0k%$N*Jb?eXM5Ym?O6L0N#a`w=TgZLr8sr8f#uMj!w
z4{-d7I;`Jvya^IAe$~_bXVT`Vdq>Tj_lDV2iQ(Q?CFa!deY<DPctf6gz>*ZM$i0JD
z%zg*(F&iKMJaNC<7<!~6?31-`)=+&qEW6O*Zj&TGRu@x;U5;Y4>4;}NG}mAelXzI&
z*C`a$$R+}Jod*ct9q?%bcp;{~Jd#ISF^U2W8oXN|^gO!*m2fe*(dgGV5HNCxqS+fb
zhPma=diiRQ5F|uT6`biStCk{Y@0d9@hqyc*W^jBQS9)zy)R>~4U1p6%|EY3aTM3FN
ze_*@l0*)$xN=A^;9NSM}jlSy4zZHU0jA089ZsTq8fZz#U!wNgZQfP2~xRSklfX+PZ
z!>=_vvtm6`_DSkn60;>n#V#YV@XwVT0YmV&IwNlhXC0{ik<z8jvV(h^mL2XL=q@(!
zS{Mf(dVL1AZ#pAgG6EDr*@u-w*{dqv1O=W2qC>&pt@*<au<Wkqc`8G@_TALYmBe;z
z#}TA^MCSNy5?}hcsa1)=bLo?#?{^DEzg8;CF+Vw}V`1}~%^^=eS=hS9!XBER8Q8O3
z@4jy)2T_KwNFFn#ya%h-V}<RW&?nk2I#!J<R^;+#(1vc@Z;o0)_KTt1TX@6deGgZY
zDxy@oDd-nNXGO=+5Ar&Ac!7`SBdG%8{)z;WVYT?9#|^Ia?ga<uGq(-9aTe`;^^MuV
zEtK!#_OL}m{$0V4MCS!V!2qz!87&%u=CQ2JZVSN3wO_+;lAPi!cg%{g<Kf?Z&HZOn
z$&(wx9QPa<Z|jZWc7v`z$TrsF4CAG>DPXJcQe48yOV!1-f&1J2o=wpjmAZ_Xq;H_A
zZ`@Oz^P7=cXmz>?oT_f394C9)@1e4(A9}P@+czdRyEnfs5>uxky~U0oXGcK<JZ#4+
zn=v-hIo~}6A1rQMigz_{czTlY@R$ZRgn6efSUX*AcA;<>D|dJSFVWFK933@k*WCuD
zl7L7NMUd$}_foeQRIy&cyAh?OSbBa~z>*;dE8xGl8b$lEBbY7V2VU6c5bWM?IxM*W
zxA;O^Z19$jKLxUNdvh?;v8Yi&!ioap*1Ydls*}^Y<Tv39`urpJX$)50Vu#6NH+BYP
zA1{k6V;3%MmD`_zp+LAdzS1=@OIwjwU7)pdDtHWV?cw9LgTe)uCg2^tH?fhvA?HY<
zj(9POIP{m@w1rv2hg-MQXyi^B%dOga;-pp{!p2Jlhnva7v9|3t-4uWqzr_7IMEKWC
z7<Hhby+eK$3u5hWEb!JUMe;=&aBtaKpCkqvXmCpA)&Z;KuAK&jGkuwega;TPGt}j=
zV2MBy0g{K(*=#S7QHha;SLvzD2u{nDJk&pu8zluP>M=!z;`1^?Y<hhT8GXf#8`g#^
zzU_njJB&Svw}dMm3q5OAVGo_3NftCe;6s_!z1(Of18?$rjzc5nwGQp~^Vp=sErJVz
z7kdGaM->SQP7%9LS{L`(^R0tPTbhljed)zQp@A?EvuKZd^&+c&n>XE8o?Fv-(20_t
zr8?~)dhPOto`q`lf<>9MS1%$?V?m#`$=N~95f;~BZ3|3(-35$D&8&bON!Y&GcfqsN
zFCz`RZp}-Rk4tOamZZ$9eTu<snDILECNIOI$KQd+jna{k@rxm=qPVsSYm>u)R;@I2
zc67_IVkdj43=?uojzt<29(sV|+LrpMqeRLUa^VTF%pHl%xOlHV-N6|ID;9^Y9=N~K
z$kkVYNFE>LD7SaP-u@yu*JpUDaR(ISmxmsl?WNid-kD>(2O;h{KgJc_FLkZuto$pR
zdCc%2<Csgb<>``_(<;)ji6eBSI=23YFBacyE-SqTIl##eTRIA1+6Ubv9fYI{gLnY9
zNH>R^^JQnkTha>Zc6O1TzWuW`9fCC@g=N(&%*Io>jZVlO*LncbX4(xl-cJ6_2|mGl
zW98sO3?Hf`x!6b`4V`?xy3im>`gvec{)}+ATHWk>UYAf|__c(xOq5IhSyi%ArWq9=
zVB`3wd|wrbOx<U>^HHqaGw1c5^<BuKPzQ7Kgat`g)wg*2fn?96k_leBZ|i|DEMc7;
zjTt`N7B^PU!!_Zi;9L?XM@peO`3w*1K<mDgCLVI$n?nd~L<R0pmcA?oBr{t#8P)61
z4nH7oUq=p`yPw5T<W4HBmR5Ege}6dn4f^H9rHNV70$Yn+OcP^%UHdNl<&0kGFH1$^
zQJX?=AvqOp{#$vCtR-n5Pv$r;=Q*?`%`$LbQw%tKTl(ymis08TYln$PzB<rlx`Q~-
z>>cu!<khYNNGBvTKJ3Vkf+%S+w<uV!IjO&L@H;?0mTlFn(r9kd2|U;6c@raF-*pr-
zVnG@cL?Uy%72$-a4Hly3Gn(|F67;Zi{e93^u?A_jA_=1T(c-r)M%}ix7LGQCZLRX@
zecJSxp(x3EJY->?*#tiSzP-Ux5#3s5QWb9L8QbC}`0!dqospc!2y44b&>@gyq)RCh
z#U|brS7O(QOXI_+$1WMiQ^N~&Id#hN4{%+czVZamxT@&>_OPA(z%`r*wI|$iK@nq(
zsp9QS*vA$lxeO|pMbG0hDtNco=<XZN7O!YNPkN}`Vzi&FI<X@PbjdG0+k%z@^ZjEg
zrc#%Jkw&{^@13-L1kRwkOlMgJLac2wiFb;>DJRJv>luZdNzz}tVZI;a)povNj+?)a
zTKpM3B4KF5wc5tJ8hp^)%@%a_yajoVM^QY1WAx%57QC19URhGAS#pfjbC64szqrtc
z?QYelS0d0N{tzZq@bLjTyJ`@V)6>=t9`eb`l-hdS>x;iCMIW5PWN1)Rw3P-`%6C{A
z?DD{%uIyTQ=b+=6{-Jtk-5R&rO$#6vxSG6hf5uiJ3{%evUg+0!LUPR?j!ld1y$1=G
zk5Am(Q!!TbDA+aCfl|@@+|6fr<pkCgC!KKbK)kSXI8g+Iy2=Lo40s)jG+C*vh5!k<
z{-swO-lRo4E6kWnjQk^ed1h;bsI_4R7k}yy0b8z!N#I)MwQ7xahfm&D1vDM>?v!VH
z?Xa)4YII$;c78MRpw4}QcZrLcEC<RYzT{`zyxuj4r`VFt9KEw7rTL=~gbnI&*(j?;
z<5D*P?_6p;mRB;lOv?b3Zg!zZ+K9r~^t%I(gK|^zqe4#0St#XU(`A;s17*w1W6$vh
z&Vz?_;?Rv|I6I;6u+#o5Ip1_)N=h20>0FF>*PKs|K=S*?c~Oi+<Pe!C;z=CM8nouG
zC;qaawQR9YH;H#OW8H1u?^tf`i~kze+i?1wYrYwMH)PSe0{~_R-dp;b@#X+qUbU&#
zRX5{J`f<7c?RRR~ACWC=@<BAoJc-k?CY#r_qC}jx!Y`bbpKfOz0xGT6>Rg-~ZMS5L
z^H+IH^q!_1<UI##9S^`Q)^#dh+XaIe1d_!RAtY@a#p|Ys@JMARn+{uMcGjz?sd47Z
zn0c$jOx|q}bwVWBq@TcX$*Vp!H6MYX%!MU3KUuG!3<SIM{-hQzw9@S?F!Kz_P#+_x
zZ4?qd!nUs4;%8P+8Tt5sjIhzJ&3HXGOE*p4@lz=V`)hS%4;RID`aS3jA(%Ik5rELS
z3t$y~hGHo@K=-!Xv02VX8-2I@#sh_Yva6>`fo%SDB*R3x7C2g2g??ixkMHNCSm<$e
z>cWz`Wq>5k`1Bs&G$tb)%c^e5Ww~iu4s<l5*>{47zbt?p#)~WL!DC6WdmqPQ_Mtao
zFsrktG-u`b)H(U0dM1g0w=~RW<mU2f%<A|8;PI5iFOIK$d&i}Yxl_&7U1v$G-R}yi
zymfT0^A)SR<kD%}F3L8-zmC!$B{lb^db#zD`~bK+xqg&5BG<49!2yy-gfb8Za>nkL
z3$}$F=XBlfb|@F4p!j+*XKC#BQcp~89WdQZoXY%)j7Ysq2A#*{Fo5+u)VGNSu=?%I
z1Ry<u(@!>Fw3QkmbM)06J7#e`4WPL6%$Ae%O1!KO1iRNG3`}?yOCJl@q^&w1inZVL
zJ9Ox6a9{21+=V#7Ij#a~Y=*@$?8<9xdxsG|xj@F@d#J#x;&;r15w6rb0y#+P$%LRK
z!xUBbjZLqMK{%JrE~aWIt@(vOfrgU&x976H--=DfYKg=#Z2X2hFgC6E`Y*wdl3X4u
zUQ=EymI10oNOum1>oCQ7iu9I@8U9-NyZ(>c<)>PnJN3Lb{ph*1GnI>cF5>=EauaY{
z?r98ekI&i(tUkGWFXJqb(I=W(h$hQD?l>@I%j{)bY=afJFTP-UGrh+^ewB;$S`f!&
z<i`1`)xoJ|Vqdp<DqOena{$lSrixZ*59ewd^Tk$;MPkg3DtPluGCNzIU_HtR9YXM;
zKjV7}C|&6uM|h2kMH80mn(}_Fzp6JsGZeDOu*?H^jJrD4E`+zD{hjvq7iZ4$s&oS(
zsiuxhIag@%d9Q|$m8SqEt@W^%4IavfeR{Ba5e~iNWX_GV>@yVm(v6?CEiv6^<end}
zO+n5?Bl?@_D5yKUR*ysu(EQ?$^gc{Vf%@oY<|+kWPRzO%lrQ*Ym2ym1bHpph_seH+
zHD2BRBvNd3ROe9gN~giDpy_m?xeLvh18{bo_+jh3ZNO30M@q}>^OAl3E>@p3b0_Ev
zQ<HluTnpjrebW*#0XAPAch5YnG;phP+lBb}ey1Vn9=vTTP_!derXXUZUTLPurIE45
zJxqC$zS)zN@*s=h{d8HXn3WYhCwc}ZG<#n?9!0K?*XU7acFw-K$_Dzy1}lBCv>I`+
zSaq%o+L5YYkCg;(w#A1SkCrw5=ognxDQ+nXpDD7WiH26T|JtYV_^u+7Wr)8Zqkqs5
zpZSZXw3A!P-e*6zfu=*QZ>Y_qcL}i&Q_&45?^i5!3}Asf=rSH=mttwYt4125H^&aU
zU`roJ3yyvydoNxFE$3HFwMZFRbfpH}c<J^*un4jfta90?>ruinwiwFA-a_$2)A<X+
zz({YY8I2n1jfHISwVpjm;!V4G_rm#U)0fSdWb#8>sylDBm@FwnaXi*L<4C%eqlD7M
z>#yB0yIUb%r@s2e#HE5TDVX)jx1(d>)tgW`=xG39qlIKjaX~oqv($YlCC`jJu-g#k
zhRV{7h=*vv(<U~@Oc0Xe$lAnvr63mRVeKtO(+|<y#n$Q36V|^^XszQJu84oxl=!hH
zY97Lf8!0NUXNekWAgk1@FX5zIxakVKu=SVC4yPBg7#(JjSdjCsIRIwhqY{l#oAU}a
z$V1EKw{7rV3i*Y0hei3py1h~~{w&E{V+n&7mcYt)M{DiSGyeL0hFjn4w&`s-C)U*e
zS|w?<;XP+RU(2-9U|utT*W+4ITdCnGKHnKrp?7JfS=9MVsNGk6)o4}Vl<)DeI>AR1
z9{N5t1{OHLsU1pTXvlFDJ36{28CkU{)Or@wY$1AX?DPfQLyWB{gG^}2^?`>h4;!GT
zH3>kHyLDb$?9Q2a4)jK&#V6!2!%B*XR;?7=W(c5tpt2bXDcw-eVcfZ+6tzD&C1)|M
zzl7XrWe4p&m-kF0Atjwdk((D=rYE;gS=2=EX_Jn2U1*dW^L;h5&k8yxl^;vsvYF7B
z>-qtl=gP}B()Jyjs)|70ZPm_{LZiHO7`=T@!3W*O-%BTCjS>2+=BLtSzKQ9@d~G!0
z795!_+iHk%8fLj1=v_66Up_cz)5NIuFoi?bIyZ7*r>K!Tc|b;}7z)`%MRP)Lk=6&0
zy<@|vnO$eM{dmGZA1~+D+J-%dl6GYP(cmQQ(;(~|0W@SRyXMkz+vuhdRTyza-?~Vd
zwQ&M()EUS){;j0<Ch8c|y!j~si7md0G-#(3YU>C2BylrS7vv~|n-MQno+lYLlgr`C
zAo%waXk}T;vvxzyaJ_QEncqyBkA8cazEUEwN|Ex+lf&T9n-M2d7W~!I*GpQpGPULB
zj8RJgyOy9~2CDth%~!lR2GGF^J0I$3IdQKQVL{VFL+sEfOk&A4O++8EzOzy(NiQ;a
z?>|c>Yzvqd9c=jMVwpP>3%eb=K6Cp)SL@@k1=S8MqlGQ66XxGFBM#dzi`cJhx0-&Q
z<sD$)ymU3vX+||IX~s1+cpuozHLP=${6uWc;kdYf&N$EFHrLK>D>x7=hG^WcL^`z7
z<6$Q9VX$>ogL=?}5wa3DLB_prJS{aXuxp0EY&-&!mZF;aqtx5gO7H8~D{(it$45E|
z%suiSeDem-2o@AA&U6@w)8cMA{x#B68LQ{vVbi-BTH4rL<LqD++GbE@-+ynbnkf?|
zFKdZi5hHB#iLj3uw|I-!&k|yW5hGJ?Oz|%}5X;={-D;Fmvd631=%;47hS1gdx_U+{
z&=CF$r)fDQvv38|7CbLMIYzA9`~oZIg(j~l1~#3%$IT0L=nLZY)Y1C*;GZKd6{*J&
z`KhRM5xK_!JhMK}%TLqn_TQuc;s^UHIgr%iRgm!}H@QgUDPyxYXaf7$J!eXWECzqI
zcG4Mn6oHt%hYy}-^P(qL)QgYzfyuJ_E?P^=mOO1Ilm<dlT-y%t+vuRT`P992@KyDQ
z-Liutig24Yz;sg+S(cAt4enTfJU=XrSgN$V^kanMX`)A}XnP~!WETf<4h6JTEDN~x
z1jRPYxS-Tfj%ZZr1XtH7<znTpwvS_Vl=U=hlynbnH6iLWU@qC<vWV#w>y}@~88ss(
zNs_Wct&>9IGYxQWMf+RrZkeI0?c@<5lf3vbZtPyUzuZyGWK5yu<RWcXebBXGp;rEY
zisPx~WD1p@CN{BMOZyC7H3QGFyoJ;XM^&$Oc~LFY`X=NIkb?XnEOgN+CBYrLOoMoT
zB{_;6?#dDbmc=frg8+uL+Y8sjuhNV5eX*DlkpG-<YA5bl7=(YVp9{>X)DFRMBDnmY
zBiZ+%jzN{1zIr<Ngc^POS-wg{+-xyogz8{H&My6<cA57Tm?KlDn;pV&5$)cV^$D><
zW^9UbfcW1_szk9A-7(y3yc49x6uR-FB}$|T*g9gb`D1HB9(+$^xs-QW-VdV5oLi9J
zf04<{y^7JCYY$b`n@8PTX8fxvlzf?@@t~4PY+>m0qwhP@<>>|Q{ry*c&HXOiP=*%T
zuX1&5QSd2H%(UxiIj#cN$*s9)oa;dh)92vpo%S?x^{Y`#;h|;yZqJ$iv%bl-Ao)Qk
zprJXRjAy#q+EOKc$Is+vsIh-*r&b^k6c%vvV4Dvl*8F_^8$Mu{Vd6S*tbClCJsh9k
zD6JF7WjpRciJiz-iw)SkUAo8&C=2zq8nY}Em%LYpd20UpR5!ca4S{klx7@~NCnLXA
zd{d+st4atmr}JG+qyJ#{Nu(^V7MS|ZU)!!0Y*jf^H)=tV>Z{?i?}xCMWKqOpRAK5g
zvZ&XGVV;MU4aka)DrkfwBseG2*TE65-4b-|0VErZtoXFs8Y6gWi8gFvT+Bn^4rhWp
zT-n>ug?NqU=ZGRX^Rv|Z<e}6K-Ad(0LF_-!dt+$hP4-d}F=0XkTlPITtxaH|rN21n
z_wDZsJ)1Kc4^>ef0q58{tR?C;Jtk~A4@Mg8T8(|dB`d*Elv##Ow}raVgU@|v?AKUA
z`7L)(*8BIz+djXqAKUB&{;qh2{UB+YABQwP*q$kw0?1eC-I@7O#37r(OD9AJO5NU!
zj!WFuIPv&yf`9hIEP3v(gUELumB3v{?-rN?PUBwij^38x&KTlp@8X>lMqY^+<8$Sw
zV=gDh31$mti4S->p_v@gx^KecN{M)CioFVEX9R1|n{dDAil=4O_P%J7z#rxeLY>##
zA!ETh3z2+N-_Q={O(arvd%JuJ5w8ps4;qheVvMQD=<oO8a0YV`fhv!K54!wHIG*{)
zo<Za3kI2#F@y8Y22klW281IuuV@Uh|sAAR<vh^QjI22kO%X!l>{Z>LKt>x~PYaYOH
z<904$S@bV6^}2fBbrfQu@rjHOw13KzP;3Rk_m*1%z>)!9O26>!Y|813#J3zYO6uMC
z03QA<{NHNyxkXt1J`_@ta=)PkQB-nsU4<wNOv<I1wbCBs-r}U!8Q}Eer!Ee?Cc5kI
z$4PaGNgkAopYKqsQ0*m#@7f35Qua%_Lx0*A4gC0y`V-TCU<P_hgo<=}<xNGfSVRKr
zKTGJHf|NhlL^=lMs_y;s0palZehi^vU2So-KkQHJgBSs>;3)iH?qB#EenQ>7&x`W`
z`Jcq*_zC6mp=`UTKS@<zxqikykd%G<&q}>rjl%NansLsPH-j!cVp<AD1Vmvc$sfpx
zFd4=NM-A$MRumL}U@ZuL=L8iHI2UeCrQe46_l^m_6(U)2so<Z@g!OfS^a`pb^V79I
zAsx@C2|$CjM(R)h8h{G{=R4x3_gMKK90;T&2}py)RVf{cKe<<161Xos@4No@A^mop
zwd)*P+Ht!IJbw)L`cFRs_y1pzf9UHOb=bE)-D_$D+myWXFzD>1d5fQ`mYrtS-|Xl<
z-2?ObGEuihiDj{}!9ao%GsHKpTv<zfMS>&1`qt-;B_ICRP&>2u9(t|)ltrv1ZVhfj
zA<B#qxqpH|K4cQ?d#?Do)!&%>_0Ii|1XrQ8y!I~qPy6;G0KOfIxB~y>D#`>>&wU;}
zp!n|y{?m1ihu|uiX={I?xD{v#7!~fZ?(7GFLZgM6EWreLWr(7~aE6m+nn*OpXMcW*
zEokeGdA*A%lu?95{j2MO*h0H)ua@M_E>7h=rmr21Bmb)=yL;-@1q0&=bs4uIgBy=|
z(F9zu%W9A2_R0LRjF|gyyZ5k*=>+}Voj1eC%Iyi)pEIzF-Y-+Qg8uT;XsyS$q}^IW
zu|o~@B2kBcq~&z?DEolWl_h`0IbUrzSi5XM(?GnGKLG*!&c0y3I_OXpCf`*>0BXCy
zuAzrPxb+$98}a|EK!pkd&;x$YOW|^Yg+f=7-qCESu@G?fYtHW#o&Z3#Rf@b;)gFpA
zBOsv@F&eat?gX&VIr3GQT<2JF60cz`VYBH#N?ABX+K%W_B_KFL%UtFj8`ZwlZCH}p
zMF)Z*P9xsUMFSxRiv&#Ak+G3`NAq-rYr4;_O`Fb<B%#77UG6+p{bs;cJ{UU$-JTY8
z3aMoc{ILw0W4zQ+OF%NESLhKS&E*r(+$P=c=*L|v8EYJd>R-UXhY<)8Qi@q(@;&!*
zOPnHVA5rDh^|=K~N=aXhw+LwOvpX^dsFJLX7pR+}{ajrSou|T=_EG@gnn&_@8`e1a
z;qy{+?rIt6O;*Rrtw+-Zr%t~S5XWLQ+Y^qn#sHcnCv1Bia4wqLrxpN4FM-&lhpF8r
zM=2QRk$J&u+Ib<?mDkihJ#Z_^3i0~!)Pcp){#Czu{<DvnaW||!Y)M5m#2_rfP@jq?
z%A6)_ZP@to&{{~|XW*KV1p;i{RQmM2V0-mlD0ciPo9t1{W8{du>&08hU1BiOYkhB0
zUkVxQuy}D*ENF0~T`woQMSQ0jeJ<gj89}#*w(tK`KLg!j<&TqL;4>Nw%Ji=YMJyr2
z;1IM)MQprWKec4zN0?jpyCfVoceemRbM=3H_a|RiCf<9nG{M8-a)Lp&Vg%WAwY@ri
zqSi@&cdn+W4L)t|2cI(Lc8V4@E;|I@I=F<15o+!vmk))4X1Fvkgj3QrYx7pS=;H44
z*Kxh*!Hp4s^(8XuYP|xr=5?o}yIs0;?@KsqOsaA#a_^g@T~t}7Pj8bP5sEDH+z|L_
z(zV^0O2m5e5$5!6DxH^NQvwMxQ1I8`)ah;iR-0*<q1iQd$#Jc1A3eK;Uwt|=^C6u$
zczJi#kSp?p{(QL?GP@kbwnEb9b>5rbcV0uesO^U~tZeuH8k0&%#79727iEMb(DPc%
zl2I}5k@S9?u2XmH7}~^keC1S6DKva<w_;~pX|?KVu>C=|WS7LtQ0DUUBrS>%;7r9n
z<B*4}HnlSWJ~NT;`StmlZuuOAowiI)#8idh0O-QA5xy(mDY!K?;hy(+;K5Rp$~g}4
zJa-p!Xw-t>9}8t%lbJN6*v3)n<)S%fxlmQg$F$RhzUqMJ`w$vA)DPqKT3<v~kd==_
zMO#fdeUrEk%(z_7z9<*~RV2-h%XwE#+Z~h6OG&}NZ|CSQJz<cOokb_#^e#n(u>D5#
zPC8A5bpNUvN`J~2JM(|;`};l%uQ<87Zy4dyL+8#^spCy<Ee*K-BhvA1%U@;5p;$UU
z#ftEp)EbAmQTIrs!sfa$ph2ag;6!I8Xs*yuePPGUntm-xpKu={gs<LAD{mq)mc{iI
zWr9&-wpA|>T2@?aFDBvewasj#biXd8*xnb~iUci~2#oK<m50(F@qG|9ttO<&*Vk@>
z_zk{fm*ziMXH4SFJa62G9ITY&OMHXheoGy$-m*{sfXoSxg6~Bw-wRJ^FKD%mTHW9G
zhsE%#pDELGMzQ;S!5)~QBWk_Yd08&jtzqAvgsm!)v##-Sr6EtRLQd}+KgyZ>)p@DR
zy#wcF(&xpVt%b2ousnfKM(kl$A^L@8o{Vn~(AuPm0}Q>Wcd-S6v+N>-Bk64NkVm7u
z&CuH=ougl=3`4#cw%fd+m~Ia>FEyyjbvKRo&zxW#ZF}qQ8nLg^XygZv)0G_s<s_d4
zAS}N^c>Ok-gB1kUN`C38`E<O*hQFc2evKla94=h7J!W3QLMM3DYpn$Kcd%bUShBX-
zyf~R}@;fO(jW3r7IJQL;TzUyTWEua4qd4Uot??Z{qZwfgoC3zzTsgJyBv1omTV48^
z>2L|oCRJrizTgN+Qxuc=FL1SqxAQa3VtvCJshCYbHVZ14d_F1in*11rCfcY0L0XJP
z<FUvuNqUy3cvt8oIdrE7_QTgy(6YJqkd3{R2OuzDm=PU+kZS<Kc)oUBXdjY-fJzR}
zF?p2P-vt`yEy6H+lHQt@7fI7Cotj-+3N!r`$jjfnA3O*!h$n%oU5t~~2s;d)&|d}h
zegUYm`+hq7hJ}y1?`8VK5Q-@z=A5Ka6mq@?QgK0IKh!1`Z=u@GQ4Q+tyb9w%A`d=k
zW*A(}Ww7x@QoEPmxk{)Lx$TylH+Z%2arI=#|8g|GL2K|K<Cob{9qdLFy8{87Q#BE0
z*pxH9$3g0S<>$$u@OThUhTjfP#Q>PQBl@;ki`wlvJ>VY39dEF9zj;^@+GVRU<2SbQ
z6lC&b!ZvLdKqz=o5$nG5hdE^qzj)hXwZBkzoTOvMkePePSdMr8IfG-9#n$R;5aX?;
z&QDsLzJzZmUO4~M0ldhi_`FpcG{h`lq_iZ3?rBAQUx;VM));zx4>Hibo+*;Am?TDs
zy2qO)j<8Uy2X$MN^W+z{Hp%}fV*kz_Ep8GLQBh~=Pk_q|{3h0Q7TM`L&%J5Ctot9Y
za26i-Ix`sptHPJFIok+#3p^t#2Q%;)P2QINn~_HO9yb;`K%wlHN3vwOmn!7(C+Y50
zG$i*(=Xli#@O;<Q-DLc6QK;tXN)nv`>sFBYgO|qfuL+P9$se~yDqVq7^SvopA#o$C
zuKaWT@pd)m=qU{GQ%lZoMQ$&<n8iI`NN9S8l?1WYzJ$uOO6ZTIRGKXJ!u+MSUuV`E
z7lbvx2evlzs#DPOZ^b1tTqkEKO>Z-MA1_0=11+`n@kXr)`2uOYZ$=95Es@vDMY^^c
zw&O{YPbz?4@_{Vx1>{HJY&t@bxx<8InYp4M<RgrWuj6rZy{lQ>3BACM7@*rX9dclX
zO(J9{X5zD?hoU9M;-rJedS}?&X@AXpZs1T`wjlaMPmdAp9u;~RUyfEI4wNYVrlh3o
zBU7&Kb69%!Dg6~y_E0+sO1#B)36;hd96Nov`Dg=K$4?N9FYA9X;|f++N898p*CgH4
zC@?1jLSl}DDmd<<w(5W<kQPs8R?`WLL|Ms>_^wW-TwL9wD|_7{d^n8cxuu_-&)}{Z
zQk2i}OrTUzuN0sEJh9BQ2Hc_p4DnGFe{S^wbX#t`NBi@Zc@wu5=6igmT;9O8+^ea}
zzL4|%&7NQW)lfG~O9Dxmx={O1Ioz7CczY<j{0#`C30lVilu(c~PR;gFE7JPNuu!0$
zGRI!A&}vqYM1YL0H3x!$gp$)H9|Pvw<qqiHsnHq>k(R%}j#4BwoSs4omi_oeCeYW2
zuZq`{0Q_B~QP*kkBF&Pv=w#E9k7eG!<WL@;#HERwK!lGr^BVG^1<|r2`^!-`$~@?)
z30Kp0gP&a9WX|lpF8(4r$oTT}8ChLDW8Bw6$)%R=wtCU>$dQt=(#b1&hQ=zsbH)VM
zG4!S9pk&~$6_$b=3{B>CxGwk|=D%Q9t2#*ejnCwezH)|*#AC+S;!(O!M_vh$A^W&S
z<Vt~diMUJcM<dd=VR8h(?M=<xFT2I>ay{m218dUbb1T`;^CTJnZ>Fk$=h6%GIWo_=
zk9yg`7etOblf@vC4hpwxK8S;*#EJ}4fl-SY3Rs~gP(I7l@@%ROu=KTtZ_C)7nA3Nv
z!n{apaK&jwp&-)DBDmF{$?K`Oij=FgZ;nxE8JC5=^Fm<~93Aq?eQw{+!HjSpEq2{_
z<js)aE#PYNNGYwt(n{SS1gsT}+$V89o<3JgJJY^-&Kf%T5yamN_}o<~D5$ekFS-w0
zen&5~(HmEqWGb&XK8V?|s<5B31o|P|9Ff*|dhreE45Lb`eQrvFZk1L80@wvaeYxCN
zo3tRI;;H0IC!?6!pzF#FE<kC`D_<0li)@Z)!DD8xoSEo^6KXV9bA8uncr1&U*&Ntx
z+E?}+gJ!A8TYp%&XZbqCjy!5@!slrq0!tIZ8OPAm3@~6|)mM5#_o-KnnK>tiDec$8
zXAvFDD~E{(Zf}(w%vMBobAtq4C&r<3(m8ZwwdU(wS*^Og|9A7t;q-euyrHM_!S3c2
z2a6dEtQz5>h-y5W9}c;x%Jo*g{;^|$Op?VwNw`w1(2Q~Zkf%Tg$OUBd`1#jzv-qhe
z((|zq6<a+Y_=qgG%)F+Cq+Xih_7Sl1Fd!=xx#iBhRYi#8M1D}I1rcV~-S%Gj{!Vq}
z)vZaToM#`uiA|B7Fq8d1?7d}Flx_PrDhPt0qEd<y7Ac?zsN`UQbdSV<3W$I-L$?aI
zK`3I-AYFrWho~S(N$1er4Fk+RE}uKNect!|u-9H|ueJC8%k$y!o|%jDI^#Hgbw+Jh
z_HNOOagS?6;c5=}&1ha=CNtOQMUNe{T_O*2pZv~Otv_29gTtmUxSz=BGCg0Cdyw=F
zw)N1g@12B`WO)^ZwfrSl94A@zokxV49c|r=@Q#dPnzs8U{Usm#;NQ7e{Hbs(Wy(YO
z(-A#Jv3L6Gu8&8Y)jh?hi&$L)PuL&KRf+RiMYEl!JwCA|Alp>+0?vC^!6Z!8p{fnD
ze8+|RqCFbLoL`IPye*$ouA=7xwX%!}1vK79F!Qx7yu~ml+-kkK#akBBmzpkwF}0el
zUp;2GJ;EYCedUK+YhPHwQff-*9IAU#geSo9Pza~W+^hMpJ;{d3<WGI%!|cGU=5kY?
znCKGlw*%_z3)DB_#5uX!Toj}QY!?tOqsnA{+eFhxX=%N&JdUcuJric_Pcd09c>0@$
z4S989{q*_olHZR^@8+|xNr^%89Amm*6;-mf<LiEzJUT=yJ&an!xai(drWbB+%v5MN
zuxahnt5iMMY|!D}s=>Y|)QH#ZkD6VUr5e=Edo&Q~>oIYKNgyhkoN6D|eX{PbU0GXu
zj>%EU@FH#B99>#L(?Jxut*Oc(?ciXXGtWasZ#J&7a7E!e$Hy)PivGx14LEkS#>2Om
zy}ntgKfYhhmVVr9<o-F2o;y4}nG%*|2BBdI`=}m%BSy7KW^PE5H>R#{?%NYy^xFB}
z!=EK~T%5{<Pbc)h6y;9RA66G0=b;D|B$Mi$4nErJ;QshZ*<de!a`8j!N46f}8mG>l
z(O?_jJh(Gyrq2-W91L>Xb%q(Y*&s{+P23vs0|C__w7RpkRF7TLwTjCY<elg~H%zCl
zX_7SR(s;)`t{p!;!@43D{IIHsAlG@eQ12D9<KI}pa0ZH`z3Ywp1(QRpfzwA&Y-?mb
zg`Y<1LWJZTQ8^)ueAC(-Lw0_O`L^t6)6?QPZ@5vlk5r$ciZ9M=c64PLrC5Hg<COH1
zMzb;TnDpec=hx1}Qu*=nl?MnNazod~Q0?6|Y;*i*+f*=TaW`bVD_N{ivx3Zfz_#`o
zLD68Xat!C9*nWqe=j@-Wwc5?=)fwqR+&;w=yN2zLwqH=5Z+B4M(qya3Bz5eO&9|lW
zQ^7B1Jw(3MCGBPUpq81xA1&c@WPU2&bbmv=r@m7%y-3f|G^1y#7g9W8%muRensOA>
zBYx<W{djY#gZ<>Z*@wa@+Ib3*zbei02=4OoO7WE%+rGbAi$Bqj4Lv~1@cQ=^e}l{J
zDuFj1uZ9yF^ZPgC5;#Y$A?E|JWdF$mpxj*AJ~vAC8=$wU4q(v#=I1&Izdo^M=p|rO
z^S+e(>EG)Gd?^;xZ+LZt^Ju;=+^3|o!bfj8yc{|IyRmeS7ab!wmY(aQo(KH<;XF}d
z@WYM*=cRv#3%>&LsJ2C_>iXA?`PY9i2q#rl(7oSmhhPok1DI%#F>vrVza`sYB^a@Y
z1GT^X$%kdE;iu`!Jn2~fYR3PBKfN3Qidrzd^Gk5N3r0mf2becuoji8^w|7GM1!~Oz
zj!K)~pH)>Ce)=mv+t>g4^CAEr6FdI)_h$_pgrDYeC*hL#9R*u}^J3_G#>wBGl@9P$
zr3Gr4h2Q_YKR8g0tV%v3zdvhiKK%6m%~z4BbGJEOAr~zD?>hn6>IJ*^VOz}dXJ%3R
zj&FV^J~9&8wZ3ya*k^Iie)yA7EkmSIu>n~vmSsUc+iy_|A_um&*YFj5qT;6EHS)V=
z3EO3O+qP<<2B!ikNWs;RZI)i}jrc{xwak5c`mK(|C)j}joa>!_LaUfD6d>7WQMPT5
z0Gx*JF84WB!fyJ2Bi!ya#$$U$l$<Cf0oI;O3Kqxmt{gLCjtIvX3^>(=!T%sXM*Aoq
zU_dalkEPxYVvnbKVpWrPzDv`qaP=V3b$g{<;zY2@m@DFMUMe8&5FA8&gw@Hb)AITz
z8?LkS7tdcSEO+n9HbG8lf-7Rj4!vaT-yqq>&s+pXXNiXS%^)R-P7(X*e6^>Z>7h05
zLw=WiE|2Y=ty)K+F*(Y3;!L16DLnAIaJSV?&5XMh@1@e}AC!BNv_)U1;DL^j#tORH
z2N2m1m!@CVCqdk@_4pjbu8<iZu~}WZK1fX%4Yf=){QkNvK`GMin3M!~NHavRlj~wW
zhnP(XvqiX)?bYrN_0lKOb@J-@%C;8mg2^i?1i0mtr81y306Dn#_WDr3D^`sgoF(wz
zYvx<sLxLS7rOD^I_++G5BHdO$;MR``7(zZE9&aaM@a^S7C>LiL#73k6Xd~=6e|PRq
zk^KzYi*ObrEzpwMRqYp6)q`J>oBt_Uqs7Jf!lQzJ*P6)Wge7|Of^b8ar?ys*&>a=!
zlzt%<RUTXS@#mNV8zVKIRm5_=WH(k9iohnzyz9`{XICB){b7kNcC>CTt$oM8hV!Li
zwLp>`G?G-mqS?ZnMn53#R+)$a*P37+V{zx@3nMCt%BLdNSUt90CAoSZ&`7ds(=zV#
zAQJF*RfaFBXtf;0MUcx<Z6W{_<Sh7YB`#i1l6iGH-X__V>Wjv}C#R(cWqe^(4tTe*
znQXTY0!9D;D&-(i43_PXNPxG&gP)fu(u6|*QEncK`~jc$YkejO;iEjaKRYG9ma4tI
zYu!!z?~x+Tj(?g{Bn7|!vz6)2W-w%%gMWF2q+{^w3x_TX2gaAIl6_#z&Xwy-)L3m+
zlJqOW6=q+C5DW@CDYj#eibbmqE>_o7fkCIcNt!i0UCw!Z-LyiJ(Sdwi*3_Cs)IPOj
zwaZNS{ufGo8m1OJ@urZw5D>AcUgC_^$uztjd!Iuj5(s_Mj`E9DCx;k~-Y8{6dM`z3
zNZer%W3Tz>zP)Mx<%smUg3vd;V1@=sVsQy9fcSDz8K#)1x7*SzPG4q=mlVs^I}8F=
z0tUn&lj5OBJ6mh2Rx@DP!}^L5Vx29SxGh%Kc_{)c^C6L`2(`;Q@Ne&DquB!3^utq}
z(TTo~Upqe>->9HqJ^ASKZi=nwEUK|g?$I=z910W7>N0&XMJF#^eCfxf)%i*q9Wczg
zPFbbSIAA|$4+!0IgXW|t<mTt?QsRzFnI3K1Hsp`IGPm8#f3<hyC#}Ny1Qr@5C6=?;
zi|9Rs$rRjXluqwZu=<f0h6OhA2BA@LO^FJ7swdc&v%N)xo6i>auYMoDsKPSoXVvF4
zwsBrCH3}jFav=wz^X2hN@&>by`Ia<NG;?5!BUo%Onc)GVl{AzR^;uH>ddn(ZJE7*t
z3Y)U3QJd&o@sO{;N$2rs`?X$&ZV2q?Z-45MRP|z1v@vW?m;TUZ+2&-*JbNzq^$ClK
z#$K<v_p2YLU6!Ax-q=NNl=D&2^*wd#AomI<qw7d)&4#oV`v&o~8*O<e&EF*FdW-Tb
zKcLTfe)CSb>`5v`u8S*Pd>*++A*~`rP=O>+yMxtjSq0yfItC`P9OBlPr2ETUc40M?
zJKk+=1EtXWsdYv-t$ETWZHB%&`94bOZDE92xAoAsjr7qF6X-|tusOxaad*;ilQ~gh
z2F!WdIi}AtWhb$d7JOBeG?HSfisZ$cDtFVU!Z^Tqg(gkpadl+h=`V0K82Na>xZpcM
zZ~(8SByL2N8GLkP=yLTJ+>g=df&GQX-gf0A6zeQ3g}KQsjVl^YpRnVLhWtghN{;r1
z>y2oBy%jjD0dx&fb*(9<UGGGaV3U2a`X95i#3@|arrr@W1{;h+DO*yN(A0~s_1H<3
zIJ1uLw3ejUm}FjCDcl{8kReK%y*%g7LbyfdtyTM&@8>IeqL|9mIP|vDdr>)d$<(V5
z&f?l`>UXXTUWWN>PeFVQ$+?_#?tC?6Y`1ydhII?mQ0m);sFZx|YxFWEqS#i=z}VYU
z>G^|HYPiQyt;=!m^cG3VNKxh|#P5Yj_Dhzv%xFu6XuE4Djzsrg=(DaQ#CI)4$+@St
z8T#p?=daof%Xnxf|M5ZG#eSF$n?`ro41Z@MQD+OjXVSPD&Ept&bcFU%P}5L4GFX$Z
zaj`WgHAH~ZsbLa)*uQr^iV?NG4#6mkYepIJYfj2dAJcaRVvE(e01nfN;x2$(7KP@L
zby!;K_vj`^SrwDdD+l7%o;lY(@uh!~H}tPF2wdC^&l$SE(JPx3{ygP-@~Fd!H06|H
z?H`c(f|6|0sa2HRw!>dX=~E=^QSBWMPA}aw#n+^N=ohNjrp-6GCgkS#;Wc}>nv(a?
zbF%ALszyNu{aPB4aW?#9G7BYBX!`8|zQXa-c<NK*nX{LkZPL5Og)TO&o1IhGVw}rY
zDN6Vu=QdW%t<o|gCPQ`YF@tN)t(2Ur`4Lnyts}Y>#q3vF<ad(k{s;~j)mHxcq8RJe
zB6m%)kYQnQe@)<rsvAz@C%yYILxURkKE?`gy>G*6sD6Dl%G6kp_;hD1(qpxvtnKNN
zGLB*<VX^i`@3O|J*jU+98mdX?C;qg{hZlH=8*$j=yW>3tSwx1t2d_46r{1GTK0wLQ
zTNN&XU8FZ)A}Z}JPejSa`y!d24-XXezBr{RXZ)VyJ+oddogLSNS;ObsLy7c;X74?<
zM_OZ2Z`TP5i|VO9_4F2~V`4o!lfYmSY(m^#qhTP(dN~GBb05~Ea-c?EVC<a{eXaFe
ztf_tcX^^*W&RMf7w*u+TQ(Wg9#_64yyd52jTFI>Cd-1XkZRDwqgN60{ghEKd0LkY5
z*W9lDVvE)9H^{mTM=$DWW#dX!mGE>?d|OOaIK9(U#aM~tSjtg`Mz<Iz4!Zml^fT_g
z-q-=LmJz++JzeOvSGi4O!LrGR8yokHL_a@kPODD2ez1pM;}|pK?YLLVX2=I{gjsnv
z$W^j_zFn))8T0($IZWOi@r$1c^SjDVuN$P~J!f@2IJ!Ksl!muZyy2!onvJxFmc8BR
z@0t{6dPlK|FMOe09q?t{ggxhb<pjhJE#YU<E%z$tJ#sTH^4XhcmaT0?pKVfH;7q}Z
z1-{l}CZtf=H|QHC<?GI8YW|n%d=K^A{B)Lc)#BwByi&cd_!U6LPm3BVYdhuUmCgJC
zgAv~`(*h*?%A}2W=Qi(<=}H@Vaz?Sn-}U}T^i-OyGMd0P;i}#@{+uQa-LOxCl8$f7
za@#mn%x-37#l1^d#Kh%Xui9UY9?}53R_MnQ?Sj$_-*Ci{32N$L#_7LEE;n8;jnn8|
zPEZJC_@DqXq?XsIGxWt~`sCK8;Tnu%a5})oTJg3}+AOR@+cDUi!J{ry|I_`O`dm?(
z?d|#=y=XelYP5p|xrb@62G6V~$=<EQByLYbNu99707cVi&7X$eQs<s%r_wK{te`QO
z!Jn%RQoM6FdQMbTKEdDLp2RiZ+v_P=wD?SefxNG&!Xd^imT#qrOOque<AUCE3BBT(
z-TewmkMcsiB!A1&#6>t8Wbvx${aU@BaYeI*)i<m@DQf9|u&+FLdA-d8OD_qjS>`|9
zUvyXV^J<%(+6)m=Xlw^sK!$;;T4<@@8+vN069Dx7fE2#<$x~5OWPV&UrSD3h04ya%
zRTMiPvKwza^%^~YW2jE(o3=Q;x2OJ8%OE~c<xCl0oAu*ur++I!UaNS{Zhv>wSd{u8
zsN*s5GwzZQi`E(W>=JFYO8hgveSTGkC<g8^t&ldB4zy{nFf>Yt*yq>g<~A4aSy-eR
z3vF7uQ&snnwe8=XlhY}vEEy+H(*E8a=^lp0laI}oa#tDpOHQ(Q4O%n)maFW)H(CX3
z@Kw~+C;v;?QVepG25PMTZ#gxdC_a$vjFAfX{@FhM{RnLQ(6cRF3pe<iKKipJ45WrG
zufX%iss9qTP(w>vtUUI9SMm5uPciHbP22zc8GjG$9<SoVoMDU<BQR2dqNI=}lndz+
zqxBV6cFRXjd4c0zd+3|rbvefnMi_Ia==zICs?U*-ZvmE68~4%r*sf`@Lw^j;=rVrC
zx5lJ)a}AfA554>ytf)uW-BkX9e@{Mm1Y_jOZ#8)R-h@|c!3zyrIp?tJcm6Z|<YD?X
zjPKIh{P|l~d0_fwl@9+G_z;04vK)8Y5u0CM7)pcY6~d6p;zTRz!$rHH+>W$3&aWzc
zw{5ypcp>1n7T^5pOgCieX=wEYFz=pbY%VY<v#MU{?i^Vs%#{skbM84C7hgWzX*=D(
zrIw|;p41%QSrzI2c4WJQ<e%{-A<LAGvRXB~&PQpecNfGbs}P*j1?hE`pd`rs=r2-Z
zQ8>Y__Ot@>u^vDtoC6VHIuIE+6JnPB30fSTxxNx};LecnHY5iL>49<|b>0V(DidB(
z7i@^B7QKaSAEjx`x^vU`fBbRejH^4+?n3doflUav57Bpk{#>Wh=b-s?$0y+jKaPn`
zXH?49>bY+iHM>LOl+A-H{%P8tZl0X_2Ri*n<Vr-r2nk_s4%Zpsv>NtHiTLLjJ0U4T
zYwdRfcq(8B=JxJDdS5#OzuqIrugic8rY`9Fj4g{7d@$}CBbv$TTrSg}s-__YZ>53=
zSi>|R5UZMy?v!)J|H@~d1IO<pO**q(qm=zudh{LQ&i3|UZ_PAqEzs(@vcOEsLTYfN
zT}EQ-QsIM|@$$z#bjjC#ffmjaajQS&_&1)Dr6Jt`5>dARbtMtH*NYYfsvCnz-P`5-
z6x{%3q}}x*?fV4ki!ClNTX$`GTx?9!8RNmIe>xgF=ds>|t~sxpUEPMm_ltMunHlKQ
zY`2x@St7Eap{~3vs*&1IAM!0h)9jTiMWJ=?uQt1H&p7a?=Ko=WhgZ~zkiNbwHZp-i
zf6I}O0Sl}{mcs+(%-TCqp41oU$N6>h8v$rAL<0TrChPM9r8i5RmPSiQFcn*u@vcF9
zm5h3h6&A${w?ya5_nxVRa6m=Tp_i9jC2H1iWjl*gEzTZIHyJm?=(l)G>b=-B5|t}v
zO9>XDa1x~{hKsm=8f8|t^fK_j`fY7b<L4i5c&aZ2v&g+YZ?dwQVrCrC^cA{iBU*Mv
zyNWFa4=OzIO3zC11<{!|K^SHC3|>s3pp9v$uz7A-d_%^q^n@Gl>Jv7oJWIDXyLVQm
zI*(%%FQ>6y=Bsm>YBSHZ9%3)UMet(^e^4=SkFS~arw=H7{B~n;WdH7S!LV!(?{=r9
ztiR&jskXF<liqEvywiOpMM*D+v`S(FIvs!v*o)5Q54l>EKwbu`9fc@5O<M@K5&CNB
z1h%_4^`zJOanU5QmZcl<ZtDZS7N-k>U-69&IFU06nGWYQ;~<r5{T?Ztud&6*VH?Ra
z-jJy4UP(vLNWG&X8h_iM8*)aHPR9pMnP0T*6YFl!AUm&}-O-h8YSNlAH{&r{A8y=z
z%~s$Ir%I2%*r1iiH;DK!Z#Mq1>||0wLTJwe^JzdzQ>pn0wWrsOjJF6K)}^f;Ai)~6
zX!w^RvjYn|7ADW2;TWk@zc@$*C0~>YtIVfH6@Ws}Js|4oc4}6ACa}LPEvmS;j@TkR
zEFQNEmNRCoocpAlGW04w`s};Gk+Ygoy8|<MqG(F#{e=oX$j-D2HNjhPtH#Q#8x1?%
z8hQTc{e306YGOaPV9Qf|sjXFJ(MP^!efmR%gp|`!xBMnwUE)^Dl`qs<2chdREl5$i
z$b+86&k`qdS<`i&JsOXo<J0ZXm*#E8HfMO7r&H|tTU3P{#5PDynX&F#hc10~$_Qp?
zRqhSvy;cbRXCGDjiQeFHTlmT-QI3ZfmkOdQVS{f6SPvxU5Lepu^N<WZ$cG%@m{kk#
z0x96;cIKj7mFCa0o)9Ow7DO~MBF^V_YNcD1I&E+1T=u=TGTEBul9%P0L99u^5l+)P
zNEQDSXg~3>O_Kf$4?0z_ow=O99ryX^PY*jf&J5eHa)v{VL3ii{!GCe{FIXG)Xs<^M
zGQ>z1VPi#mmk3YoK~|^XBgCa1+XkmSbzwLLx4O5uST=onlF3CJ7S>r-QqG-Aiz(e@
ztJJHlsXHGOCSzF6)-B?!cPvX*-V!HTQ{E|j5IA=ye8Aueu9p|>Ls9$jpm4#b)z;PI
z$ugmPKi=zaeSEG8(m)S!cY=AUPT9LO-JBZqp7BtIzlq^r8-O-c`t7k_iT77pL>Og5
z4M{g;#j&&jv$t^fCvyRp4Yynf;L9!aF}t+^;ywb)o~Eg+MQ1>YC1|ib_}(|+BVE0j
zhW5nh>%N=Ow4ZWW#Yc@L<MrCFwK+d(%YGKxV<{Ob>EY#eaa<0spij@H(Hlk~8<Ibl
za_agvR(#@%zkBEWku&BMpKn@RE3e;K0nPfO)X?g=Vq2FEkn>Gf4V;;dq1KI)8!x~&
zZaZ%Tw@-he73q>7#2(zHe7p3=pW8lcWt*gDr2VtuXiV677Q24@FF60~Q5m{rvodCj
zlSGEgPfm~jWDS4kZ15#H`&pm=-`XztmK#6-NWU1aoBDC^OI>KDwK~Yz?~(X@3SgX{
zY9!mb>Pk}0^3R#+b&>%p#(Q@&{|o)cA%&rA#L#~ghLuo9Ts<Ja`d{^5Fw}o~-)(h&
zuOn>kz%=*u`o8ODe?5R#@zIWLe*T7(*T`q8m80Z82*l%LPwkT326mG|T0-5-b(`X2
zq~tsHT;FUMcK!2zh!5aAK*I6=Aqr!6Ed*=t|5Y}LPH|yT4G1n7whK_s=wv-m@aDa<
z3kO8iQv$oz#&p>t?9zuIvv?p$E-8HVp^S|H!S<N|F@Y5-#b^JNoT_^L&}k}c*jCd3
z_Y=vQetOIkMT)R?cPhMJ4&O$7;r@I2z+Thw$v|3oOvb(lVzSFpY^Hrt&nY?kImVS<
zy|{VtpKm=}{eUEdn0fro^lw9VScZW_doyT6R{7B1UyIB=Hed2w^X><i9{k9FHj-UT
z_0{Q{NNuN?f8mtDwM4o*-|6MOUfejc>nC9En?C&h!aZ-md20liY;gn8AWO|dutw2C
zax6{=Z{WLrQbdSM*rMm*P*p%4QgI^5b9?t4$N(XpR_$9}wIMRjbGuG$A|;%V)lk-j
z4G=RWx8@(4=%`LoLtDIp8(?wUcgeUu8=^O32?fAsWVH?hY?PaVEA6s7A4emxUJfKm
zNLp3(iyufZcI^aC<v7GCLs4s)r^qk5*pWs$+z%Ny2-k6l#Vhr%zr|~rbg~a(ph-kG
z$3LEtoUFk`&I`=Mncq(0N6C3i>Q{<y9@yC-SbFRr#S=3C#XAM1F?^zGOQUr&C2M_4
z1|gZ3@Wu6VBt+l>rmN2c{P+~(y4q<RKcxbtGDgB@QMuu{qmw*<?LNQ`C5LI{TSYUw
z&R3L<ZVm@2^^F*ew)q$CgXdf=k+GS2f0E*_{U{K%?lC&ioZ#{XAbHOq8kkH=12=nV
zl_sJd9}*xR8)zwVutZ|BgE>_`w`l7EA5#R0&gR3_uiDByJU|KQ2Km=~S;&Fd+Xn~6
zRCgY(E>aS|?9~ocyQI$qoSRv`EY8&tz{uo#8L#JyHHedt*THB;VQlM!?16*Pg3iG$
z;3bT8-{_AI254RDo3r#jXa3%HxHvOhH*AnxMyQABc~T)Plgp8T?&_;Oy#(5c3_c?=
zy7x541-=krJNx?11#0V62(}I}<>N0|Rs}*ZZ7v?i*ZNN1y#S_Oy`JmB*XpZp`7m9D
z4s#a3{t%Hg?pN5&!|FFt?z4TdeCx@>jXmVDApS2w@F$wk{ILj^N6=&Rt@?}3{^2<B
zjQcudDUWe@I{}d=pEkv05$zTev^7^WCt=nc?}wiSYVf%{+ZjuZYO*N_2=X28-JXKV
zy{TT3=&F-r8eA74-px8Tkr26BwFUn>4cyHNZF8dTq%dm_wa99(1Ab<y-6?5M`gT<T
zh`o8oFUGW2T>Zuq<ScDB)mA65HGh4o<I_j%Y)>be+eAOStnF9j;<2sjuAML<A{l%=
zXz&JyLj2O^6pkPkjN?wbf6kn-R^%0~Cb?K+f6SCEbWMbsBN}fL<qP$YBxLNBw||Z|
zN`kSG_>HLu$GWYgP~!n-&&FKH>?`BgsL}MI*+t2wp&5F+B>Md8zK8lofrecmnL#M7
z$JfZ^WD_FY3u*dW_V)jA#y<n$4xW>i39u5i3vA+W2bwlmZK_X6l$ULchPr+ILzfXs
z+P&_63$N4I-BncMo{_pMSS3mx2AbkkgLDa}y4T_GH}6(8ZoVMh3Xt6CIAJD=<%d9&
zVAfj;c;Zew3(!H$WX}f#tp{(gUNF<o8BY-{BXz{!fEU?dTLnTY2WDs6b4Gs1r_2+c
z`50@!BT4>K++}q+n1(8XJ~l;FMyiloqUCx&po+_cv)n<W4vh;~z8WQ?w!@Eqkr)@m
zch-kq$(|-}W@3p!>Cn@O^p$(<-M;v_%rJ2z+0Ge?_B5qPiP8jF#}ncK#^KfIwRLDX
z?-!0?!(pk8@|^0*v$UKXh;d=tbfb0C)%z18K<&^fSNbvuK4;*a^jH>qc;LH-anV@B
zkzT@Dk69$He(RMq%Yu|%YLKdOBAuN^GGLj7?VJ9p<eo_WI!#Y@=ABRX-9sV7lu)&`
zDaSfZ6{B&==G$@O^=5Ttr;dBRT95Y~+%hBoN%fHaLbAr4ifHf6fl6P36P;k2-q398
zpj(f1)rK2TgShbOH&xhnj4?3dQA8D<;>E`H@`sc@q*lSww6#dQI4o`WJKnq^T|^o<
zhY?Hgoiyl>Y(L|Oc!)67#534d4fKX=$m?@*n=1gg_{*y&8kl)YW6&CU4^M6*DovG-
zx9sOi);1aD!2!|Em*4MQ-E(lECU%i09JU1{314#fx;XVP;D_SGk5QNrs@z~pfM~Ye
zO&8Ek*&bJt61=^w4qjJLHG1wWoTxhxt4H-Im3G6_qt5AwZX`r0Z^$10z+<w3^yu)`
zb3N+*qL@1_k+pEfYy=9bYu?7I#~D=+)m(h8?MTXb?`(Pat&Lx5p?F(rAQ(o)*te03
zE|1gHB;TPbMrae4jgfbiMI*IikV;-EiHpMO@VD@~1IcJVlheM5O<t$umZv+Ld=4X3
z=Iue=D@%2Q)-Mt*m+9RP$P3;Qr=P6uI1%?wzM_zOkDkknP%~U01G}NS<IVifH`DNi
zZwIzDxRe3<AS^XVx|x+NhFvtc75n+YFV>0TAbI1bNXYCa`pS26WgIHZnhFRbedNZg
zupVNp9v`(RbE!A^5oj(n+9Z<Rd2(OyrsK<7ZFXY_zxDFiKy9)O8J9?Z`{JFp;~S=B
zQAed4gx;J>6l<CS2gt_r!{Qu&F81<>Gf@|}Dy*veQ(GTGa`(gGfU5A1kz3Y!VP9F;
zqcrhs`7kDJL#b!|h-lTBcyB$0@jQ;RIqS(MTrbQP!?#JWsbBWM-V9KzI%)f|*Mqq2
zK3%3AEfjk#3GP*JA1of9dEBmzi~YXRQkX7StB`q2to`gWQ!jMDK`fWrSGg;_cFhW<
zI>m)eDL<v!wZ#tzF1$?7@qSo0ap7+Hp0ZFD?7>L5G64SqMXjM3j<!>MQI@_zLUFR+
zmm~}X8}30bYv?deu`V2XR6c<ZOSsQ)t0!hO#|x;Qd+tMhR`yfsr9}<*$y`Ro3c|VK
zm;Z^?p=8T2-k<pDoU@Ek{(w=#&+0Pc(9->a#0U=Kw@TzK^t!i)Ueh0&<Pf{6|3FD6
zYh@~B%A#mSxY=<PH2a43?Qi-Ny_OcLSS^7`UGd8DxyqTrDrEY`Ql-r-=d{^Rv2*0P
z2@%f8H1!%<QMjLKKZmX0hJs+cq6eqoe!VLulIBF>bT361-OaA51>Z2+edi2rNU5l|
zT&Fv%bYq!pi04+zrSRif5gW_PisCAVXsPzSOn4u7HpbiAlkCW0@*A(C*p9!=Bj)HB
z%v}(j&dd_MBwDuVYVRVVf%b4|bmPt;wI(m0Ovhd3uEt1}a_?>VjBA**j()bc@;2{g
zh@Ilbq!v$7oOZi9KbeNIe7H!f_+_^?vn@e~$J#Zmab;==imM>YF8Vah9qGJ3@kJTC
ziTcgYLhZT+NS=Hsn^FnsqFTJwhW+ZsOdj4INBbsjRO}D;<|p;U=E$94ZeDd^jQ%Yq
z7u<56%iK-V0Rye7CG7F}zb{bv<5X0i2h-8xJ59o>-;YMcl^KdRyevB5mlScu`u-0>
z>ELsoo-a1;#-Q?%my|#t!R4W#Z!gVkM6g&*qt90>hOK0&<SW~ciP$A}>%Dg88W*2R
z&FVS7#AKFULz}Zh=qJRy;IkR(#WtAwwLNi!UF+Txl%+U0X(Saf246lFW#DaUdE;5}
z&vDVDOk;dzBRKRN*I{&R2{()DQ~$C**vHiFrrS)4DGVmu+vm)(nX2hZzMLG@xbCK~
zIu^ver{($pNMsyBTYjc5Eq}bqnvH31K1{AbI$lS*!4=dX>3qC*5}$GJ`ehDpf3>-N
zCENlc-xV#NHEwUj_U&VO9yP!&pkeu>ICW`p#p$cgEuAXSw{Cy-cFF=|u1Yr~BLmBL
zwlV!{8|LSmb)wW8W3t6dEWLi7@kHs7GCANhw=femX+*(?9go?wsT~fY<+8m^b6N=d
zX|`8{{4pha>7vGhTb{~ehJ+X-!ss%lTrvD*w|U1x7*V)mEghFMR5>qbJ`Hd_1dz<M
z+2F0#yJH-Uy}<%E_0=?!ABg~hs=IbogZryoVLW%F`YnB@DB{B8&Q@W4L#+ru-m%?~
z_0Njh(BD(fByAt>ionZvf(?Pr$5<SCtQQW|+D7iMpA>hti>=^j*xRWx475Ar)r*WM
zHgR$~I>IcWa4&h#q(yrBL{gjxY*QBpYDm(mWSz)Ys2(nLG4imQtGy`kF&vj3Q8T(;
zd{>V!q#<)d-xys(7w)T%{#sj4>du^E=F^*_u%vz?p*WS=^jJ9m)L%oGN#3$oC5YMV
zieYiAf!%qoZ76D+iN|dyDCu5!vd=ab4QcR%J-20vHO<h0Vu4gckgm3J`1GG25Bx;x
zd^3{ibPM64o+|FgeD||K=GxL024IX#C0S*CQPE^n%_U{ZjH8BsH#lA|k$;{PbAK?W
z6mBea`@edkL}=8nUH$&s1p#}!T7Yr?-+h91<J_B|ABSaly}&P4gpP~VOyc|}+8xDC
zIc}+<x=8-Mnt!9g^XTs;T;;QX&+;GD6xfX={c6NEprZTkvG2_;jOjn%z-f4x|M|r3
zcgOaB7%NVlvjwl=DuUQ2<xt@~f~JE@g@Njy5P(1}QiwCpgJA6kZ3+qfy+@Z5`ax$;
zc~%xh;^BLU`Difn#;%tZXzBGmh+~X!=g@f(z*=Ln&KZ-bUW)>rL$grujFal%J>|dI
zO1A4{nVFda!-{G|;r*Lx#N#U0$f(Xmc}7N+DL)C@#ZRHSs2aE4<p%hB|ISSv)(3>B
zl*Z++7WJ=wP(}xSJloBVZWpKjpV_ev(`Lb~Lx<7}!X-OE0Y&v{Z^Ca-6&=8<Wfz>o
zrpS=<Qgk@*y3IDylOfteXumf2xDaiju*c5U`!T*d8ReKMM7jwv;J5rYK&#bj-zUd<
z>UM|khfBs?PxjMNh2h~s7x0vhkV^#6{_DkDB>mABd93PXy%9j*nqbR1ap5lNOEf@N
zxm7GK9b5@vM>{nGX_Ukko(P$>{n*)TFPpXM0*J3ym^=s+o8HKsLl(W3YqiXZhLwEO
ziB;c<otCCSRmQK(;(U4PI*qttr7sPCqtnS<<GF|Q*^#I?$&3ESBjo_z#h?<SlqKQ&
zvysbz5UR^K%YH^1xl+h{@XIs4Ky<^NlA@(gRV=pMF3aNs{+L3$q=P4~G=B4Eo+7;&
ze#v=x{Cz1D@p%=GDY}7dF_=ZyE`uOqN}EUkS2rNGn#1`B{1D;3Y0^$BWmGU8^Wsr`
z*wy$M?XuazDfyCvZ`6|(K!y0BrXx;{(FN{kvRS$ChhdE`Gua`~-5BRp9unR)%REt^
zfR<*Yw*6lA2kFp!!0esgX-3fLS?HzBNp3F(Vc=?^T$5(@ye+siYvwDXe)gsME0yUW
z7C@^g!)-ChjXk2$atCQTfYIx5Ugpo4N2lv{vbe7gjAJZH;LfYIBsC6~;aAd+pxn;|
z{b+;wMpQPK%})qE421R2z*o9{KU4&p{7c^oQV4XelElUr5ZEz0Oaq1a>nbMDIrj2F
z>+S;GwQk&#?hoI}TGR%iSHaRBXX1{QWr_rAwh5y9O4)N2=phVG8GfyX2bWJptCi>t
zE>&>v7$?fU0`8?!F!J$hAM$F93E1TA+c6FWZ#|gX0l7GF>A}nHs=u0qUnD&z6SDBE
z>+*H!m$}MUCCflYD8DzSKIQ55k4p{NQ0o>L0Hb1NdIT;vn@WT7whh3tJj``6x|4uF
zU3s7f`Qo-Dh1$zP5t1Sk+KjqZUP5r?Rj?d^-f>esMU%JLm2C20W6VwJJT0lD8hhaV
zx?u0<5gthsYk4f?Gz+)R2%ENWMk;jijkFio8UyqAzSo^Fv)ccd2EwjS^lT>z+!DW-
zJ(u0Am<2uY6`RQ9D=JTK1C2TZmqiJ|g*xxkF-3&~3@K=w|H(2CtfDJof>t&FP{20a
zsT5FeiqfM!Q1wUS;w~1~>j{E?4a9!<5Ka0J`)mzTrDb;v(&M}xBU@x$zn^=TKf5*Q
zjK}FqwomF6+U-omIIm2OXeZK(B^!x^MYyeMsikClHv(*ykD2uASA!L~E!{qdJ4FRv
zOzUoFm<)iXvyOzoLK=;I>#<i4{1l%!&NZ)jA)V@2ZxHw0RlJACWfMHywev7dJI6*6
zI09R7!7Xv*zOF*-)Tm~_)zM>Ut*GKR*_g^pEtgJfsy2{lTuBs=E)f)b83Qcir$a_3
zc7c49bgHls1$u@>@J6v|Rp9Gi7d8-L_YlHt>p#KuI)&xLjj>1v$OAea^(K<x?ua$W
zUh=<hwKz`)v4^`Xe&<ND#FwUDE(bnki2K-<JFk!+TNucQ8TI^JH9fmP#iDlZ+HKj8
zN|f#C>RS~hKu)O|!pqOK8n^}kkixJ%O!xlWje|^l18VU9n}fu1B_;kIJ=5nSJV{kg
z#DdieKH4sc2)AuKy1wfi_VV68Ty{I>?uLyZsVIHpkJ-uD63BxV?f2Z<vmj*JVkL)-
zZjbfA1I`xf;;45#*+`q70uaFGCkI`aKwpg8QG5D1ojpgF$5MlP3pTS=m=zyJ&&aGT
zkADm(yt@rx;w87$U^e#&7m;y^?O30k2oO)tNfsKpyBM#Jy`D1E+`Y|4RRbmQ;-#>y
zz^cL0l5N$1L2Jww?BGRhj=VzAk&)R-k*$lVe8dnL{;<zZ>oZL3{XwgM!sszxF|0oP
z&Udl(@RP0hc_G1y$Zxommq=3-`a>z`XuPc|KUL0X%2WMF>6gdu0jlee7yJCEM&ZNL
zm2esqdP=s1?VoTZzG43BTmmdu{s`1q@nRFFiyPpEEYSzEAxZj>VakttOR!R<E_4^X
z7*^=yyVu-Y5>QqQ|DNy@iXnFVBK&omtR)Jz2Oh3^C>%<RwE9}!7=67`s}N1$bGgTP
zD(#g9c?A<b{n<V@tzdl-4y`Gnr)xd70aJRo2!@d2M#;yamZhD&bMph07#dGd29FW!
z-B>mxy!P%sI$@w>$<tiBUz~RkfHb05s)ucE8WF>-+j<7;La+4odS~6vQFytkvYui5
zoA&vsh_du%5_isasZ{HtFMUFPr6iO`uA{Qw{xGKniNcfj=yF`<`t7ynMY_5)|BM3(
z+0ip#H~(_wHTCWpk8JW>2*7U>@Pzbl<n*ta_89DJ|4)6Qe0rN}O@{L@=`-3yy^=x~
z4cS4PvmAfd!X#vi98qOAZ+~ax%n_IQ&cE;6?+U0rUN;c>s3~UnzjBVA!|9Yz{W$8_
zpAY`G&*rQ))GPn<iND7KOjiGgv5I;WbLp%kP)N*PAPMROb&6^N>dim5GqD+vA(u&l
zLFdPNf<o(wbK^>_9M=mD%Xk8Xbck8xEE`AWuD2F-mo$h&iLYb-Nz7TO0&jknji-$D
zM}g`%)z0MBVr)Ha^x3~&80tG?bxjTT#^n#}4l<3A>@?5spUy}jrCQ&=>7Ws?v}<>f
zu>=O`Ct*XydDq<e_3w*xz>o&{F#q+Pe=)VOdC*2VOG?WAmtQOb9?R)x#@^k_1is2^
z8Ms!Zxv_Twarzl|y_f-hhJ!l)$(spKd?T?nRX=L=|6PM(jyv+ZJvn=i6^RU@WtZo)
zatAIu2X44yTo+T^H7F3`29uTJ+r=SU$loivG++DKTkKD1>$e}@^siS8Q}Y)ezWNPn
z%<4lDblP{ny*w^#Kixq(_R%3r5A;3%i=vin`<eCGcUMSFPf5TggyC_GlyI8{GQmcg
z=ZXg+Hv%>%mqpyUL*a6-A;9)IUVAAD_t=8k#sWXy^wD6nuhh-u1aMNkdc{{pcZ$<f
z9^*ix?E?3B&H$$4FjDwu0cla>d>*;gGrn)1gx|@lKh^DLiWX~lW)PWl(VcHcu8c=L
zo=!@Lcy3EpwCkOrqBx<MexdrVI2;86qErMc0y?S#kREgJHbkajirORy)0bR8M=|sA
zQoWUz9W+L1h=vRNOAZllscP1sj(h(aK$&QbKP$)ggr&mtLwdQ7J{*LLM3Hb5Mt#>$
z3II&iOAsEVKu8Tzmacy1i0nYD6pI)jP<jEu$(<`DbcH+gnY>`&%>;&~enxIgf0D}@
z&{=J8y2xKY2dHaK^-QX6!O!%<NpAFaYcObaL!Ez`pyxC~kG>bf;Hu%BNP6=+pZf8b
zVo>TF()o1%si<Bh>2h&!yi%kEa+j$%$b4t>ceV-La7$s2g!}Hz71e~4(|$Y!K4dMY
zJu1i<@4)Ggna5$M_Q(ZukNAhceS1ka*MWt}Lqvxled}EXUZAiaAxA94H_@<$bUo7<
z-2BD@6rC{btZ1kbi)M1Wb@`tFA(vlACEFmjBrgh&VE!}qwng`sXSBVGu|bNN&=?iD
zti!1;Kh)ZM^*hdXtR8%K7mC2$H3MS*Y_Le>>!=#ZYihpjcIYxm=!6-6vOq(lBk^;r
z!(87g_+LV}DedIj(=okPFQ77)_Qw}HWu@G0`o6g}TQpZ_oO<tg@<T`HC|(X6JEASI
ztBVM<^2*%b@an*kKaM&A3#pJ+NwqIj&}4AcqC2+^?w7JEg4<Aa9o(@SbM3fDGb}$w
zgossvYd>vxTc}uC1(<*Rsm;0OI>e@&b-?_4;riX7+}0$us<-F01|<kl`n=5pv2PcP
zxzB#CiklpRzM`O9ry`&G?qoa8GT9SMTid;{Zs79!2m@HNEgvdeCv4tDR}c(LfEHK+
zdo~d_6E`*87ao(MZ^TIV%?TLocg}|rKTFw9#zo(w1JX7?;w5(X)+6JI+WDA5ru*`|
zfD)?rGja(lBW1FXUhlA*s;3*+`Z_><m}=Y*u?o#mH}ta;4r3|gcbs~xDi2!ttk1`~
zFQiZLM@5qisKbTF^QOaD+<V`&bfr=4AqLfxl+8-p9(y=Tsu2cuC+>^t$3G4npl0OD
zhUXr?@D4F^NEXKVn5?Vkm}*>JuE3eyxtZ@>ZrQF{B2G8YlVl@3Hi}IZ{X>8Erl`yb
z=lZn;YnyD(!Wpx$T=(Toi5zwwlhk6piiGk$j=Jge**?&wWg)3U=IJUQeRPl>gD-yv
zWTIz!E4Q7R<Z|Rwe%@_M)p~_lNI!9vGm_Q+${?jf?C4qLsMM*%o{0z+unjS$B7T_o
zhSH;7_}!E!dW{`bucy7^*VlU?Q)4-IfT(+#V|PbELiQZ)%`TI1y2N2CDd92R7%dE7
z{@TZjo0Ih(V595^Jat`n%}t>u;nT9Lsfs&XSd3KM7D@ZJw_@EkQ{Nh6H&`XzUHN1@
z(&ld+q@BM_7=p#YXnDNUXY^S9Xo#8aO&@kbb13DOBhk?*c2UCbBigLAaBeEgStk{I
zk@Q;hg2{GGH+<kOW;+s()T^|r8#|o;Y7q>f>4~(wc8yH%NCYc^B|N$?(2T)d;b%gm
zm1p__KIE8UZ*iqpZZ6P~P3erDb9!@2epp^8Cf&9j+cidRT$yO~8nBy6%kx2FzCO|G
z%mepiyBUZ(sR~vTx}T@6gnUMBN5<mNO4JH^<B=70m+{l=nk{Cut&8{)mo-;>Ov4#G
zhZWoIDvs_0Dk&=1(&g2N;x`Z`sgu-QkE#hOF2tK1C}Ur&P3d+^rTP%tcle(w@~{jw
zNy&cG<?*K3gGweU{YQ0Wv^VAED@WQ6cYN?<zxIQtzrDcyXG!=-rTf1oy8_9#<%Ch&
zX!YF_3aKyXpwudBd}6q(*7$V*qf9~P{Qul1ItkPYGW#fF(@}t=^ron)<~@1y4?Y?d
zOZ6XkQ`VeDb@7GN{@sVrua1eW2>?!|Y|f3{`!VvMfv2Gu;96wk+_!sVk?rdlQVsmi
zCwA}Te~#6aWa*oKWdZ!J#*H&{{J?i;LO@FnS_xr9Yg+7NJ4wf#aF)9nq!8wW)tUV~
zI$+#L1JetHb`hS8+`hGIX2oVf=_Vp6UgKY`NJclWpHrHqp!Km_TQbi3X2yB?^FhTD
z`7Ms3(Myr3peU8HR*#sDmG#76^uZqP$0`{Sg*V9j$1+mw2>aekBGn${*W@iB5+ix$
z6}+2lk_j5UyvsaJQ>}95)+A+HA9V;0SPVU-mX=n{>s|2#dq}<Z7;J7Zu_^x~*InCS
z%U|mqS2Gf?azpQRC3eI#taWSc#x*^U^KQFRALg7Om8foao6IunS>xUMj#(oq(%+O;
z>A*(P$n9EK0vJevkSFf5A|7WuOa=Cw_-beWVw!o{oFASPHN3mNIM5P=QcDV7y(nXo
zJS`_2KDj3vNp?<=7{`!qkGuX{zOC|T*Y_Uf1F6vG+utuVk%Edj^G~e|?WHNCzz2ws
z$yUGE4;=0`8+=gu_1#;o<uB{l+E_B5>B_MVkn0V<%1fARpX1r1doQRYf|r3ggVA0b
z8@cz~F8m>Co&4bhzx&etg2Cm9<{3~$WJ7(~<wXHm>Z4G8J)$^i<=Kn$%;wLwz?)7g
zI+NXOW7L_B5e2+MIo+IGOQn(cg;wbfD7N6fxwW2w7XH%p&j^_gx}dp3gh6xV3pm%c
z4g(r6Q})_lv4flKA+d|DJKx&CP#?~6MBJ2p%a7@1Zrm0H>p0KqTF`nCm1lALlm@5K
ziQJIwQU&_Gg_U7O5)BRQ3pGNVp)`xV8b>qIUH>gk<wZ5>Un|=`fa2a{$TM%|>3Pn+
zF||6?-at3a!=<d4Culn=uV!=&Jlv1UwpX(NW$FTDk$g8`2WO`GN?e%8cO<N6BD|^l
zm-HlD?<y2M3gFgE&yFFmjpGY@H<fhF`L{D9TuLlyQ&e-`@UFY1<hZ&d)y|c!3Oy<>
zZJmC7J7wm3!Bmg6Xpy3!$7<7TUa4rDtdTzY1XU4BO~`I3y<sXWjc*dpwrL#*Fb%$c
z<J<-bLI*-HCxqENPg1=*-(QiwqMJ4iF7^z>&%mvj`Vg(}mV@YjT7vok-ODkKaQcSm
zhM4Js@nEitFe|DDb~+6S2nDp#3{eX~sqFNs%_aCI?<#`znkh(vks5;|i+rZthq&hf
zr27N}cL%7Q=W2%62qV?6&R`lKNsqBB+Ly%?M0Hjqh2Am;X&pfrkp@z*wj49Ghiv)?
z$fZX~-Oa^D-y1xFF2Ese8;lorB?sB%-`|Cc=mmoLPsWbcoDJ6WChUBCDw%Ni6$3%C
zt-(y|YkF5oa`y$}I!!apxR)9SNw=bX+jEuPT4qPKncH@bdopO$c0Enw?)Df<%M!S1
zU8pmuEqigXfqr}}?4xlEYupW9%!936p3FTY9Dt1+*g4$;s)AgA&Jb_KG$KX<Yr+-3
zg`ujVyF0)%<jL`uwDdU+9XtUJ`R+Wxr;DJzQ5YI;fba%0sI=v!urJUr^4+)YxP}t|
zU)PG04W1r+!Ef)xNx7C}+L~++Vw?QM^ZKPd2NmWC*{)Cs=stbyy>jHttq!Er?wgS?
z3)|t%>lx%ejX30WvLC*J1z~G}NBrN5kGisxPIw=la%E1GrHCxuUe$q0B@Bx8U&=xV
zrTEYtR}%;>n$1d8*W+ZZd>NWn;Y+jz+qv5*MTBFkl_K3!9&)KQwJ)X#Q8)D$Hr!@R
zhr>d{A0KiZj?$JYpId5Sh$~(Sm~Os!)ysYL>ej8@Fk=ityC)hpv*BUy4%Mz~&Gdlm
z3+;)Yomdpq%1K-oR(V%UbI`T9+FNeUBf;oYP*b{NedAWAq$j}Q<DWe`6$T(&cTOM=
z8}Q~zh-Jmd$f!WTgvI-vo-<ebu+!wTMu6EJ)`!0b&A|SY3ApQKbFU5XA{I%-$?8e>
z!BcBPPX>^D_{7OLaNOV#mkw+J0vZQyB*e)*wwStlTVj$v$^{+wCEKKVi?7)lDuoxR
z3DdqaT2f6mA#Ipb^zY~L`!eny&s%HiG}Bd%pg*~~8na^G+Sh7c7BX_$YZDimB`;|@
zLu{zXc~r+R!g`i`@m0+e=A{OSYUX2GHGN8QL{@IsT{9?(6M;Oh2|Zox0Y88GPpBp(
zj`rXkhy3he%j!IMxu@UTm3%0KQ%Q;lttw^>>ygP#>H71A{Q{8EYvp@sI#i^YN0gqO
z7kU;ocXZB$VZB_bofX&y(OjqvEt07A>mP4Q)<}_&0E<N4iTj5;1D7f&wo7fw=g<u#
z2YHmEaGv_NY1hBXQq5K-K@LS5?2T%DHI)h3A5zM{u2WS%e$CTXZy;`btZeGr+#xD|
zoq~%lJHAwtMUl-Stjp_pK~;QtI2Yku>TdO{3R~Mg)Be3XVvG2JO>SAmh(5ulDGB|z
zyN+hVWROwHjR&ofVDpW%4F>3c5I#)OUr7<#fj-iXcapeXB^l=9t(7y&Q@tXI*miE1
z8k2Yommgz|*=y=i4M)+e_OQ_KU8q4X8V{mVij*dkS$Q6Ul&k1PVc{$x(<~_pW3Y%N
z0-a&ii7-nNMY^@)r>LDZ@Q~j(4a?=_$%N-GmOoTTK71BHHvGKW0EeT}o(rzGR6A$m
zitEjCvHgMhSaT*kG(0}N%g~bV0C%7_m8Y$?FZb;p?ESI1`i2}yQGWf2p}jkw(+L8*
zN(De{E<r&&o`)hy(oSr>sb??_k1@{vy?KTO;Go%bq5Y8$I@+y8`qrq%;jRR62#tt;
zw$hS}`!v<%07|+M9XZ~?(x-aCl%@j#@7hxL7rvpmoi&ouUCO@vLNSCDwK1;Y0zzHe
zphLG<KNjp)f3<)hB7mJt`tZ4e$=l)>3h3URfdKK<_n{~HfmC}b(VJE)+q){HQ}$XS
z<>(FE8Fg|`RXEmvtlhFYp}K*V(CK3hTSyVNQ)VtI!SIS+q+Fd+=QL1Ad4rAK@l(?r
zQ72nJ(Q9Gsr~e>D(aZwclkQY%a><S22*m}jQqdC1Hn-CAyYT61B*^LL<}kfj%8L?r
z7LP4!hj&Z~xHea~k>}fl*?sYI<V1u{Bcxtjr%J^}NTLk}mx5f|-87D^#}-o@WEw`F
zk@H9uPPCDdD)2d($l;~8aoMWBy!z8-BP3BHphIsikgLBkNX*JKmv4C@Sv}z?-*?{l
zi?7~cT%LpEhS`JUVDu`SkY2lrom6*_Uw=0(=tF!=BVpxL*2feTK^{`Almv=4i^0nI
zt6bYx#p3Z_NBFoK_-r0-M_%&CxfNW~LGRL@vDeg?2Dk2J_7-#DUP0X^R&7@2fcA7d
z1#YRxeUX24&L2zcNO<eo9>QuzqD(cyYK!sBAIf^SsYqwvi}C$e1Kkg>y~o|D1{>A=
z3>^S}nD-V6jb3pj&!n<xJ;5eoB37cE+j_3-QRiS1tE!VAiGKbyHeEi2<pihwi$Hb+
zw6<%PP%MX3j5BN?yoE~}ncKo^=gSXeyjU5UqNMg-mPb{dS>)C)-g^B>sq$nYuLTQJ
zE$f?W#6kL?Dy=qZZ{k5IWn7eGpS5T$N8b*b$76=u(EIgSLBtM*MEE=zz5QU<T8&LX
zE!?n~NLIU6gDG`&YF0|6<9F0FLIKET5Uy$1Js2#_*c#{+&irwR?oE4Qbo-B)_v%Li
zBV%Pr6j+W$pe{&`#r0e)jl<`aj~Nu)zpi{HYKXK-rq)fO-Zp3dhB%++BG!L^!F_|?
zUVJ2ignZY=$ab4le)!#4N4^)R1*$|XeXiEGSL1Bx$vY!4T+{_S(u%uxQMN3oBpas3
z8hVYr%lSb3llWDljF-?<MZTK7Z2Xxq(B+?EUM3#uAAywuVbZUsqtZ98GTL}KP^C#f
zAEAC<Qi0y*7~!2xSh};jaGrn$@59c){vEkePg1wb){&%BVaK;r?}>9N*j><HWZmcR
zkGaPao)#cF+-3B2w*91~M)<t=gc|3gocU*Wb%)2<fjGHG6V_dKo}?sapj><8QB5*$
zg`cmtdsSf1icohg;^lh)D49~n^(Hf>6(5SDyFN~7Nd1Ni^tokQ7p3-i9c9lj{C*U)
z_7UcN#aBmW<&CsKpKz^c9XfFyhVDGeNSie|uU-ADj1MvZEd~E&I{(UslI*yT8a=ve
z2K;K?&LUSc9G}$vFJt?CaHI3@Gvxb6hVq{-9wh*$T2OSo(5_A47naSr4|azCU;YHA
z&VlxR7}>zHUP)>RUC=7=^6>E7JIAS!{02d$Yu@okW{A-Szp7~|#G0A)<XgvNo@L$D
zk^Mv{sWevBr_yXN4H4(fPpAux;00eMpMHu-2P-ZT$TbBiW!DyY9yxs;OR*UO^zF=e
z05Rt-|KIZmwGTYp#*LMunwOMNQdY2(X`P2^ECER7QzGx#T;S@Qf;8G(04xcE8UHLB
z6x$Hu{Mq5zgSyQ)FXa^TE?IeAoWd}1OYL4stfbQHF3!-)oASadeW~m#3|@ltGIr&2
z$B%|v#w;$480?BIK*dux{*0W!@0l(8Lj6Ri-%ZZ--n(nm6yr4w93CZxX@sfYj#Y2>
zQgTW|Pt+Au`wWA<c$oC^nED;`@qaa9cW<r1e?@-uJp`fwC(#j}^|0x*3&8Lo9d+kX
zW+4}M1Yd<PNca&et0?ULX$WWCd8t9n05YSz5WUcBjvaZO1JLN{TRZNHB1Ax5tv7I(
zB4ONhRcDubd$%0N%=DADW0xzVtahywx-78gem$V~<{bj4PlIjf2lg4%8a;<3*86q4
zsj_ScGkH2-5t;$^B8Sy|y&?jH##4~~(h3Cs>lvhW_g;jypg}OS@HOcQkQkkSDjRg^
z2QGuXqze(vg9idTch>`&o|#g@Y!;}7TH0{>bF)tH7FVIqU_7g%b^*6I2NIy%ZqP(o
z%}#e_nFHDl7UOT#r7&L#(EUK{b7t}~OMId3(b(~xrHTC5;GXX(!Sl3zWjb#ky)ZqG
zdUfCN9Lde~8>!NKUnq9XK>>&oEF*IxX*rs{_6d)4=0&D(^~133X^AZ`w&X%CSXJF5
zumrgfRoMl_Rw^`wvv<fFs2YpxCXTN4+!2L##0t@wq&#ZeL8Lg)ezK}*y=l2W=R%Ty
zaR0gxbjoXdo8TAg040hsyrCQrfW6Q4SZ<PTD{*m<dsnVc;&z3SQR!ZLurH4DkDclE
zvQSa{&eE`l`9$VOmmzX>^ChJzGfcqjbUpL(@{+LWk1Kf%L}&MT)Cqy*k@wv^np+=#
zvbmavpD3AK`fW}gUVfKh>Dd>Z&UQ7dg|`Hp5J>BV=#L)2ySqd_ibVM#98J8%CQuBS
zFZfG4z&C9O++7C9s*0jYOq%2EM?V;AgGvVT7V%G*bmMnc^XAXlxJiK2wP!Qmdg!zi
z5u9(2qi~s1*r+|24aB1|>o&K$;RZY-47%Q*A;5INjeyXnx551)?U_Uv-Y$fgs!5;@
zb6xx%-*@oLt(R8xREUhAD4qKxTykItNWWbP$-V=}`bq7`eVF{`fsKRPy+=~vN`u+;
zaeb!rc_<9?>n1;BfM}|y&3(m6Ibh$$OK`pwa5^gb(lOI9+GEyI#au_EmTlZFoE`En
znsW%gn5La;bz`Ya|1QyO)X7Y_EMlhJK2qkU-zpGEt;`URGa;5&RiwAR$#>>o#FZyx
zQ}W-_f1>ZP-I{ZQ(5+fq=p6^G-**-WYC|md=796X^DS<wC?kPyMW}p(D*yD)QGY7D
zisnC4_r7<+#-Zm^(r1z{Bx(zZqL$kK&`TafVK#*Nc5oisDHCq9h;xEEvsDg7zlSLR
z=T`W(rWL><wRxPyCaCKiv{omYs}4c7RQu=j#gx$eHu{#71Hj~^Q&+btc)&!SJ(;s<
zwq9;s#XL5vQBlTy6v+>`eDYp@x!0^V)9a{yNzI=*uA9JS%s>a}V6X`|q#3L|TPY&g
zR&+;hz>L_6<|=x5Xr5L>dE`XBXt9Lz4-P&@ybDfzCO0(QHhAw`DKWa_%Cv^dRQQoL
zdwj{``;Q!MUL}TQr5e2$jV|8l=!<c><nWSaa;Y%l5S2bY{L8;oV|Q0~UavCWfjqtR
z*=_K6Sr0SNQ?4P=h%ddZRw(nAf6AG|MCEIY0M%PJK%*{<$9UE?=5bD>z%Z6xr}38g
zc2Odc9#essSH`plT66GusUE=CrssLiy@HC!^eVb>F6djA!+2vwTCz@wlJ7~IKTdp(
zx_97{57ooZl5s(bBHuMQ6SpS!M_nahSBjWkMSK{Vkc9cJ0YIOL+@~H${z2yd)!v(j
zL;3#y-?oV;6jI63ZV9ENh_O_nM7GH`Q%UwE`#zSmM-oaHEwUS8EMpl<C1lAi##pj5
zc7xgO^Xl_`ztiV;9QR-Mas2+czy0CpaNt_zI<NCQpRech@yZ-v1N-Su8SicaSY>pO
zvYcob<5H*qO+%xI?`y1=Fa3eIFh0vmd3o^CaZ-M5sN4jq#P06ZkYuZryCX+?vR%io
z$EF<pb`7n3peMe2wH%uUnj{poj4Ay)mjV6#63{<)uBzJoc=v@@w#Pvg@zbM4m1wBN
z@>0-AMk?KeKc~wv6$)nkF2SBnaaq-ciJrvjtiC+OK<3O({luF3ABNF0eOvQbF`(QB
z%t@)zV%~?>Q&6!YLxms+_~wN5{W5(R4Y0B0O&^o%CE5XkuS|(ck`L3dv|sc^*wDL6
zYNYFznO27SyaZIO(#s;3-o3paSNOCeyJ~>(;Z9N%&Du_P*&EZ+94B}3{}>o8De_@>
z;sc}JPbz8*;4bS0^iKP!hG4+)=mC~6>v&6dowdTiAk&bvWEe<uBFGu3ma#m#+;NIq
zlcj}k9X8>&W2>;z0qaGdw2TK@o(8!m)~AM27QYRH&2psQRuj*O%AmGHu7sBc*e%OC
zvi*~%qcQSjVRvFlX;x-@nCWmgKxv?#vTy6DOr+uT-l)|oi@mh!U26JnMlRg4eQKP0
zW3F=K&JuBrxPF$%m@8e{1$uzkA8K)9$h~h}shMV++$>7-1G(pO5a+3nsGMmv`?2*f
zj@C**_@jbF5Am~)8a7N$kuN07>9F3uiI}g{=@oxShzy`70kb?mJDfEI?t+NZ-go!j
zbn5&+ds}}=yDPz<6T-n-7!<^#BvgZ<{fV)|d%@-!KTEv{o2tPgcK}5FaT69vd-rPY
zw}{p+-z6hX-)Hv_%F3H=(DG3H)mcGsjBj3Ten`=?qQuLhZhB336tx_^+Gg*4t7YWY
zmPP59tf${5U!~Bj4y)%`)z49ES{#X@-~SqbZfw2s*Ervw=aRf(SnT%<MS+7___KbC
z5-+7sC#J&9OZCr=3W@+;>6-;Kwqn)YYWO{GV|V6}EymnFv)%Y3d>wr((3V*El_N5A
z{+FNf5v1Yai)%>Tc*clhwj&aRR3Wa6kEq_NlD(mKUPi!K5DJ_HDydJ!?o**Rvp>)}
zPgX~DV^jl*-YltWalBmKd)`Fu!)0#HdTEb$T_d9=?=O0l*;L`Guh3U!`_7Vj(=b6d
zg&GjY^?r5_Rjo#|42axs6bvpJnq9~h4oYl^-yB$eEoUITW?gExg?0z;lt5yFXI+oT
zwBF8osUycenFW{VxGm@%_B|FireF{iF|o^!_=YV2-Y<crUYldr`;}HKny!!vU=}V;
zOt1in%WB(?T{5~^HgL}k_(_hGOD6PR6F4cY9`9A2x^E?WW#6zUU{)-aF@a|H_{!eb
z^CCw#cZO@ba-&XzXz$G~SZv2Z``~yXCcrzFyPW<Z>``T8SR>$;eExo#K>4T}3Q#wt
zm{)sJ>%Y>rG{Vj{lkm;g9v5#zh<#B3Tz<jZgvi5xRqjAVhF9YG4z@?UMG<35-?`LX
zcK&hmfMqN2UF(VO`*Kl&z{cGyK+HjQADL*G6Bs<RX*u))GQgb+$bAZI&TE6^>2Y7&
z1uXyAo`3}Etuq*9-{Ldr2|8tmUJ;Va)V)_T_9mkxoVrOMm52i?$9&_S`|4YFN;>h2
z&IJ<mEjJQ%rw>o;aF^M%#GLsAez5FH-6O6KmFl4QMa<#}(y7%bEt+k>BO}t4MAkfT
z%W$=p+d0$0kk8WfuTOT5Joscs&QX&r_UN;+upQRF0j#pX93R-&(4gDX1R5Cv%W2we
zx110HSakszaO56Qe$S?x_PiNvgePgsk}8{Dz|aoyE<h8Cb3U-zbgsWQj(^H<ze~D*
zzNqg5`@l12W;Sj3|5Ig6g2FTFlh?dA-R9qW*J0p%sjI&EyXEMgzr(^d3H2~+){px1
ze?$(n!G4LC_b)pUbc{>3;Lx7I{+rF7zd!lVGvM;>y7g>gAN)R$x-vxEUTS|o^WT^E
z86;Su!fWOJ`&`@1z@d{cVmAMpFaKxzEddz3=zaUVH{I0V8|MGFJKONJw+<ZPl1C^=
z)TXVA8vKEghkEXs05lk7VZ!;BNhyT$=PtUig_grWb?FYMAAAB%e{J4dqI{Knw19c0
z#vp-{MhRhx&65CY>bYzcnood9s)az#=!)w{u7Oj2v}U<CbeJFX=W{wVL1CV>eocof
z?sGH9tEGg@v4UR{ohPv}RI1RNkH-k?Ulxkxx_e3iRk-=t8Me^EU6P30eHwaK^*I^o
zBT>qXbeRPBl-rkBX5}IY@%y)K(S0Oxm=EPNB92bTYw*QbXh_6`ga!YtZ9wwO9W@`a
zayW->{Mcd9J<BDfCY$cC`&Rz#zlLwX{*2cDe0nbqf(PN3ZRxEq++fDOsHvOp&?yaV
z{hSwuzih3SkA8jI#-<mzp{_Jq=|M~{5FI8@O_l`?$P;L{md0E38*o0Qt%;ko9PsgT
zfM?<?DjdeMs|Ny<uAc>Ai`fWaq~xM}Juvn{E;s#eUV@2gz=~G{79paGMm8a2{m^3l
zOt;n|u)^wgmHspeacH3ltpcph*708<d>8b-+gIkl;xN7p>Sq^=gjOE(7TCT?Zn1E!
zumOu-94NST(joQwLXiF9-w)Ex1K?6?)Awk{f_jQ=@qm986gq(>6)J-|=MgEH@C7Dp
zX>cr-hrxI}CO15u*+mEY-#*dhW|g_m@H4j9fys3YlXleI2^iolBQ!uP?Lgn-#oF($
zPtF3#z$5k$*sEf^CfmOJEOK@P!Gy95Cl1Di4E?_v0X&E7K$7)fXHw_CI%8kl@BX9@
z%Bhx(0`$g}oKCQtabq21=R0=;vc*t4k}A<mMs6n!c)`45VM_gO;eARV$6$mF1zR@!
z3S=Q$0WddG4gmzkz1#JaN?RbN85G(6=rR+uv7A4h3(Aa`leSk6p=U7)Hjn#q)fpha
z;$fpabWdOgxXnHKd{(-FgW4Wi)tA9n)C~Myb~FSpH7S+N;+uh~n&|C?>#opCJo5v}
z=-{bQCZ)%LIvoFitgR{y(iYRr6h9Iuy~w%tO1C1i@NvNI?!FEO@%~&#IuMl|7oU11
zOWOfU!pv$$KSYF^3^qo_E&$5ZUFxz7mb%PI1KWdDXm`~K!NUNB-41BA-jr^TRO!Qe
zWkGb2Tg0rE@XfO>(1p0clXfCGEDR5**Zs5hpkQYa325A~NC<LZ1@YOwinx{x8mj<(
z{5DW)JVO1TOi&{oY`Tel+>2lde^gk~A>6zIR|zVS#VBG=kWZk=f$wjWTD+`*zVl2J
zO<N$p0>C~Z?hHr>5KTeCrXA1L3~3Qtc=y>!zYnuSX$)PJ9>hZM2r_{g+z0l(S2TP<
zp+6g74&;PQjzQ3m+|seV5L;vx)M-Bfu?Vj)frOC65HiDJik|pG$7&In>|LQU9i(mH
zUQ(@J7O#R9K7A&>6L`=WGk>h<O_>MC>Qq@!M7#ltAfVq50Q<azKwk9(<mJ!VXHuG?
zn*at*=juR!E5&SNafFyAACo)M4xZ#`>AfJHGG@Ns$$nmkGA-jy%bzTHnRP$HAT&Bs
zKT2WKT#)C%itH7(@dT)opJ22Qy8!CBIZ}B_lClnRKVH=<VDyo@IuEMnR1nL2luWqN
z6$Zhe^PvXH<XiMcpr#ZDmke1lSxj^KWz7roAXNr{{B6MfO9}#ym7EW38oWqOdxav_
zeGX4r9^P(iAnfmDi!eNX2J}B|56aR^0Vy#k;oJuh55xYuCtiWdMOlhD=6wvC+p|aT
z@kEbo5L(MUpk+k^?uA?JS-)OVK%ndv0_kUyYXl`bx`NIcpB;`-3s|}=SNhr6^f(qN
z0HPi-`-0?oOdi@rvZxxRPEeP}?J~HxV<05De@lh`eh8*uLS73}Zbm#^1Ja1`XpH|G
zyH{aq(`FM$PmGYX@wcVZo->2h;Z}#ANxO3=7+*_0x2&ogAt)Ec(3=bpW$>nI?vY~O
zG}%W$6JDFq<)SbZSP?frV4_V#8nj|v$WzF<m@qM1Th@yduyzP8;0cSDwb*6Ghvw4%
zAUq((n3364*yJ;cnD#%DaX`I*A#)w14GKYY?jGNxb+d}yf}f?=$@3f8V%#9m`+z<o
z&IGl8d_I#thgPcCp<c1;R4>Z6298Uh{$lqah#@z`1opOLbJyLY<H?tU8!TiOU^)pQ
z22xJB+*?;JwjSSxDb%Y+*rl@_z*4hKa}wZ9s?2Y?^BS?TQv=wW+lG{6@3m|d$M9kl
ze`&_<${hSb(QYv!-QAvZ28?tcf1a|RC)Kr1FN<D@O@Uh`6TSPI@ZPid_JDDgO*2uO
z4wy5i>_z>4MX#p8>Gd$5y~S7;A~#J4(%8O%q*AY??OK%|gnO9<scz@Pgk|D-XAs)9
z9&u{ojETCWDi}mAS4u7F*Hc5xa&UV!4L}&GB&N~+ddLfZPP?agW_BvRU1mLbyTfZ{
zH-Rxqw({VSOcE&UpqhFW?_V3WAk~hpP-%us+axD=^{dj9wx(Yum{Vgrbj4*N*w^NR
zVS~CuOQ7N2TlN79Do#x13%=!v9A45r{am0tw{u57jGMQ%yZ!i<An`WE`mDh9#oXZw
zlsqsV@w<FUjTb^o{k7B69$o1JJuHA5r;4{&MgSM-SQ4IG;LmLgS|6CqJl%bwCYZj0
zpb*ai6L&wq5ZqHUmZwtqS&OldUFM-Simu;8K<1Db{{C300mI?7Jm~(bg3wZb7b9&0
zSw#@ZU^>K0ATJZUn;YIg<}#U)MA6^0`5<DEQ?Pu<a}C}yQ)CUMp23CKBLT)(nBIJP
z@r~!3D;gJoxv<VxdgCC9I4P8}*1eixQNae!k(oC@+=WSUCw3@c<))|HbLGYod|Qsf
zICQ7ZrfeM(oZodQW4b&H(Ik?x)F}%PH7K7LE^i=v*rYxp3uc!CCX?Tt*(f@Nz??Oo
ziG8qWJivXUqshX?*vDJEUuxb+CXY=G*MXj|=9FVGil@=aJJne+Y??4y!bA(x&Rx|n
z<DF*C#6~uYBVZeo3tTj<$4ApkcfP}>E(xBWIv1-0Q1>V;S?{<-e9OEaWXI@qMiB=T
z6SYFq^%FeyBb9v7mYH&+xmBj5J-B&C1zi|}5iraie0EwTdk*Ot5i6}_?DzhLWreCS
z>&H^Lmx4EBT1{K_tm^^Xp*JbW$A~4D`xNZQ4|@PmYBp}k2UaI?*?ViyMHG2DAwXTo
zeS?yLcKo43LTt~uHlKUWGnuR>1s}bp&rghjBL$SjynAkvNwvV9rMIL4jKqs3qhYI%
zaXLtQsXe^T=C7^sV`$mSdCs3r8CJt>su*m>`lHttGyC;~W1O!ZZ(2PqFe}x(dPSQc
z%?*h$!sph<)4K+t#3wER>D_DdF@FlShbJdw3Niv{L^XH!v-<m#hw*u#x^JVo2Nhor
zfYr^Md|9pGs4s|oTBf9(W$k!|$^m&Wec2W6+skH@jP6~Tb>R&;A6%H+A5Mj)fF@My
zl^3p4-_I86>Ex8^COni+40Ow7(esny@37>6JVv3hk)0>FuPDl)Vg=OJ9qkXmVFS`J
zfsx!}NP|?(@(&(h-hm@z`yBFDM^=Cvdv@UZ;8EL-yfBEnDxMtI2o^Z4u$;`oHhM<e
zg%(t-+J=jL2KP~uHOYB|TULrv;;HlMtR(~9Z+H2r+L|1)TZ;(u+`i+7x5=yZfkPlq
zc_F5F`*>Qzk?pdr1U|aT4?>39@tk@w#d{Z2Sp-wGkE&YC8XZoQ&N}r{OLj%MNMiKI
zg0lW7BH}^zOH_%1K2vRZPM;)jSoAMgybugjng?wODQZHO<HKwW<2`U&GW#m<d#Hyl
zR@7SMyz;lguzj94V8Lll_16^g%AjGnL%VFPP#TZfOyH)Zcqwe^{k;>{VSzt%s-wyK
z16>)rVI~euohw2!hZWX`_<m46cA3T=#ZFHS;N-h1KFgrW!3-odXgr@av{xA!ntp$m
z-ApkyaK7&2lpz+etaYl!#@H=)?%hns1!B}>_lX3WK`i2jj*tO*y%A-3p$G7NCh+}P
z<L5mM^RknLGxr%i2|APEuEE?@Q>#h~PI^CZN;;~tWrOk#amhha(>F{tCkqiGeXmAm
zJyZDcef9~`dnPiyO`}57+f)o5jgfBiEFYVjCuv*ht8TyjzF|kjqZ))|x}om)+T&+#
zuh;&~S>OJojzmAX^GQd6Opi)e+=I}sb(G$Ht<lrdkUxF!6u@07n@S{gFXR_d7wA8z
z!_P9J)J&(<o<G9rhgu<ZG;ZCLmR)Q>^essndA9CO($<(GV#Mdv=qECFU%QM8)-^YD
z-GTd+C4{QZ_t&#KR&hkDV}9#l*j%vtrR|*$b0_9WoGWVA44>!fvY13lh9H9dgSo44
zl^}IlI&zENHqF;*gUp$lvPv0X8+vrmI!T~HPj%O+<%=GtC0P*qJGbi?$W#~xH@-)1
z*UfZWBwaSyu<LoCukeRw1{RmRY_w5x4t*UBEe-s<u*QyWJ3~v@GE3TSM*#9sNBb?n
z0CGux;IEgia6zLG;NY#80C_d;&wlTuGvpkTd%Jbbcz?=Ws)Ie$8nnxCfM-Rr)zB}a
zO}F}!|I_nFN$py(d<~ZcC{jWn4!&UXFzJvSL<BpOA`C~*Yc#y4b}vYWH(<H>Oju^J
z7qwLdPj!bVb<T4#<9JrC&btn~MGSA=*nc?$%%?llL9t-v!gCq31JBQ}HoZ<!M+(eI
zeKU2-F?IGbLbPQ~cL<U6Z)fbH0!zmkLzblXCuS3F-|a}h=2FJC0f5wHRmhlr;HK9m
z2Re6O50EvvmIA0iLEx>n@!^q3r_onFnbzanqF9BmZ?bAI*i?V6^x<JZNArH8csJ#~
zZTc5Dd=yyv)iTQQ@@Qt}XCs@i`~07E7Y$&Kq?Jw~?gyV*$21$+g!=EZ<K<tuy}9v+
zK_c7JN%^bJxe@9ocxIgT#hT|SYDeIIX}4^B8|Ua%fVk|Jy<e7LdaC>0qCtvCv(~r_
zbK<RF!h`+TAvuQ}#AvvApCUj|Il=p@P_DL@W6dg@jqOw7{H-pJO56E)2H}2Yb&`CR
zNWHk;KjF0b2Y^eui#~EmO(+!zMHezI4{&`b2{E5vN>I|!0O=6#xDID{SD=70TzL?I
zTo}8_C5}~BwS1IU;J!u=1_SDW%r<UwF)OeI-F!7bop?H_Kc1%D``_jKhhWeB|CR0o
zz#_jT6A5v)1jX3D{L`<cs${4NOQjy0F{qHhv`0dn!r12ft^dHLMJiBf)b9WjhV7Wg
zc<z6lv4T37qS(b0ivQl_OFVxKc3-d8`%4`+t?$4JBXk?Y+Yfp0eY2Aql5B4OBU9}C
zTZfQf2hN9+gZn+6{FhktS_<shU$-QcZ4&+<IqDk=*hK$dx&-y!@8!<qy`kUvdqAD&
zPQTp?@+YvU)4?mmZ^F1p{ATib3`=sf=~i)4|3^CcXwuuBng^=n1pqmMAKpnzYczVF
z_|HYFk3lAbfs^BrC(ldB$TY%eNh&_g&sF3G`t||iX?+O@a_R_S&msQU!6hF8;pab|
z0e%A+LNL$}#&oAG=<O*J_K5R)sHVY$D`js|s{T0yP%zCyj%4nn`<9ko5dt<w(}@W|
zE7mH1@>xFasr@4p9`BmWHt8l3uK^Y4s1e5Tpuu@I?(;#%r{Wog*}`(IeAGz~U!q9C
zX0L+@hux%p>`{%g{E}NjCs<-vYD`!JYY&cWw#EqRg3=R6Ln*KUuI3F?Nma0Ia0YXG
z%Dq2l`1%-lksW~tkyTM_fYSK{kSgIhsGxCnL|m^B%Om%1-NFyUH!o!0K^}sq%q|Pp
zUa&#8g)9l+7H7S}Cige$Vbq9#!U{py^jtI+{Z@cp)b~=#$O(Y!qE9ZntU{I$pok0h
z#!ZRWu;wze6$mSY9j9jiiMYN_jJNWMBC%(AJ~&7&W12@;wg^xP&7X`l9f-oFP(;o~
z^Zhw(t`B+8dC=TyG>lK6lr!RuLcD-07b4Qfcewwe3`5vb;2Hl8!SnxHDT3a(tAH>!
zu9WrijNC@RI9tC#{jFKP*=8Y{V*p;9NlL>MM+3aMOMV_jp#I@s$9)Bks}m>zs?<2p
z3al42V!H`yC<(yd{XJ4`!%hXLY`;YZ;8QgNq7`J3E&?^;UQqM1g-nsMkU6}_0t#Y!
zf7}0{qzp2G(3dbw;OPBm2HYOMTLC~THm}RwUZ7*zmfs5D;;;HufN1DLGnT|5QU}!Q
zPSgkD=tHD`FgcPpK=c#`YP@&_5Fu!{8i6#d>N$X=nE_p)iog)~={KHa3ldmqeM}H!
z=z%n-->&x^kn7zUl<!Z(8g;J&lY|QpyNZB`pax2whI8_H*SY>ItOsb8A?Yo^X#Z+D
zW8%7%{^i491ppp_-;Kw>l@Zq=a_Gzh@nAO_70^>{79cu`!h8W+R5+TF!vvDkN3T>!
zZ-Q3+-9Mq`U|Ar42kisEn%@Rr?CGmi#%G6H#t@re)4IWZ&x!}^ox|puW?aW#nb(LY
zI^7Vq^3C1uw{VymTpiVgH@Q5G9_X$1x#dH3Xy{(;Kw}C7BIj<pmeV7h`{Ha=@#5CD
ziT;lpmjLaz0L>hiqPmdJfv$<!N%P}ktMM`ZrE|lv-2-;QDBt9YbF}RipMKc}*nhi0
zC6&#UNd$ViA!EKi%bt^}m`!2l<7&pZvU93B!{x2+bY`03V*DwEaPht-E9-Bq@y<Vn
zG1(5W(x(?1>rK<VWmP6WCwHYTMY}Lt<L~#?S%2L^D%;+bX~Q$^vG}OVg;}&pvc2Eq
zvozL6gTZ@*V=6x}RYnR26A#Xe{IH%)MUdQtRGPv9Xnmvc*K4<|SRprX;i%hu;+w~z
z6$BMta}qo+c_tX_?yT}i0FM#?`EJ06>lq3HgyOD1HvYupZt@*yuRTz7!Lc;*TJaK)
z*Hqm(L8j0i_IXMZ>m{B(q0BucWC={kOdtw+3h_FGV$BLZs%VFTSOZFo!}@an-As-W
zAZ<dLuzUBlFQ0+xH7dQ|c+Uy@wnK>ML7r=hT;Gi!z14jJV&Q!N2%6(L*#^;E@LJ%z
zpnGx@&<O$Wc8>}$6VHM!4mhYEB?SE`czg`RU1z1$X<LZJWNpd@Xd3Yo&>~&I_=pFp
zhI1F_APBmUTk{O>;2nr9)(4Bu9H3S<19dG<bld4hGOt`6cwRv&Ab65J0M&YZI?I&l
zARf8T1{a>oK$Cwo!G8Mmdl6#gQPo$^4YizhWl&ZJ9vrmV1ti~3I1TKB;(<Lk>tGtb
zL}lD;(hl*SVN6^JU4C1@7g4Nk2rp+*@sMk|^W}Ki;_U2MIWF`XiJ6~My)+$Evmob&
zp6u+-x$tDHi%ARa@}v;6U1pVw<ksW{yh!0i8{H`4-MwMQe|?E}UhHn~r})qQBsp&=
zowWK=gYw7RuqbvesBWnol$P*Bn`9anCD(~M#-rLuqYM2!wU)g<i~Cw+-zYgwu`yIB
zcFu%s^HFJb^CG)D<0~qSrW`G+U*eHob(4r=*l$<=3M1Emm4ei~8zA$ZnI;hkj-#e`
zp$xJxhs<t-;gf(f#K5H{5TBUO4Y?kQW$T102S92cm+*DC2^=OK8a^c|K<S*F1uM<w
zPR$%sdN{B0w_F0lUj_&x)3B6toeJ1ECzDH(kP#;OKzb@thzBB>WZcrs8Bj~|Y}4@u
z#F(<KyDJI?Sa#TCrBYZ!O77xR={)$0_+$<|${7(A;)Yaf@x2U}uK|MkoWB%p))noM
z!-TDHp{zmSFuD_@Y?M(eng$UUdrk&g{<<efO9@dN)4ys)SIdc$K{UIRth#!4O$OzF
z3I+M0#THBJv}E@e87l!BPtBss3kzE6D{|&g{(T|Sx$bpW->4nrnkfjY3e21>qacg4
z-<Wz|iEnlxr3t7-akNZbn4d!r%$YAc8e_?;^1SA=)38{Rcx0f)d__-FWwJ8SWF|3S
z)r?%C;#%=TRB3VK#M$-R6yuVq#{}~^WL=+>hJKi{#vokjmFG1|N7ndVAl7rP4tVe(
zCP5R?pDCOg0r64N!ph>k^(%I-mPZAP^<qW2X%yEotX|UUv$9IcBP3p6ZBt?IKSX($
z*z>u)*e>tGFoG_3m0(Av$=SqHdy-$^-^fVuuf#NEM5rbj?-)FqWRy1>6E+Wtuei^S
z?iyZ9L?a#KxBB<1xq@<nLFoMMRS<cWXv?VpokPgJ;`|v3>RMY~0ygMi9QWs2kiX=H
z!DyKN$~5yw(ofeXNQYn+OeQDmh^SBhO(^g%1EGSz@0RZ8*vppk62*tX#DP49POPK?
z=FHu9B6kKU_J)KPaS7zEL++Oq!v}W9hBtsTSwo2g9t43ko~%uM3l1{45Mo$?_v*jv
zQTaxM<2#juRHt{^YeR`#C(2JVpC8d={@_*pHTcceL~dDS+Ozu;gA%~J=@2UJMkIwL
z3ld7K%}=>b#R0z^m;Z;3yipl<N?z-NF3#h~*M8tumziT{(uzULmcCgdSAkS#vwXr6
za9wz2HM%sFi91kYI+D^BvT5b6j)x+=RWU|cK4&t%s3Hx81H8&m<-YkUS2QxdGG!q7
zGy1oXnR=5|cPM|6`&aYUu-nf%5yFAbR^|Zw3pgoV$k%ahj>pQ_oSF`%B(tks;QSI?
zc7GcrJFc)z{KRFcg6YsjGK3^vVceR{y;W3LzFtdUA_HbtZBc@=8qY}k3=%RnndNJc
zfQlc6%#m`9H2-^8(gz&@sDJH&H>W5yz^rKbgg{CkVyRU4;(EC=75n_!`tsRN%b3}y
ze1=f?+&eh(axc}(=awX2j{LUD@POIgBkASqow!d*e0OTG`<~__lsD4hz3bzNqtXvw
zKKLF?l^rkJZOj$1G&_KM;^@Uh9Y3$`DzuxiVbSG6D3TL@)`xJcsC<$jlX7=Hsa~x+
z?D74!Xj*ugTb<*=`e%8)3SQ5kSgjEzeBW8+ZpGT}ZUdIX74_<|{FUX5-LkRo;$03B
zHcwhNL)U)Ta0{P{dGc}VYzL86dgB({3x@y=75i8GT2nOSj(6dY{4}Cauj|CDXRIJk
zwr7nZJ+|5<R<I#Q-{-G#w+Vie5xx6)NB*aJToXbrT~ot@#ZD8BfoK704uOFn+i4XM
zCcX1izj_RFQqgzsLG0a)2cq7u;7zhXAs+uqb^J~sUyj+m@gcw<8P7?VlsePl78>Te
zMk_Rqczk5fa)sEkS%rLuqoxpxE>IR8E#Gz%X&a2^yB>7SL-RHPzhv`N;8Y~RJT~*R
zH!Y1!Tdh9tmmrX$ah!EvEk%WZpUiTk)7E*whebS?v!L7)uN||TG0kLDmrj{tQ&1IJ
zKRLA61v>~kudJmlkN(0E7oUf#l-Mj|6HEG?S6ec!Oe&l{{EGcX|Jv44UaY`(jpIRI
zue@0zo}=J3SI!w+sIJmz;fP@sn;V0z?caU6{e3|9H^0jA=<R`<P%IMLq0H9${)nSb
zm*OLFO><9>($7ue*RpaO#I%AyQ{WN_R4vOX1_LtsHp-QKPx{D$w5A1dqiju%-|Yo+
zFnO`9G$BwwW=P7u?8w|ww?Q`(Y69!zE?es-?S^m-6>%;90qa-Rui$#wk;z0eDQLMW
z#FO$PJ35Y0p^ZdYa&Cqv(W|@EW-b0JO~w^Y2w5~~;jpsM5;tCl0zoB4o{8kt6tSV{
zj5f_!X=o$CL;I~>Zc7>1qPv&;9HaZ(ExDeSeZvI4xEPvc(IWMdgsDgf%7$O<J3zf$
zii3BBo50qhw(t8O+I52KtKwB;9g14qI1{an$s50aTR%B%FsKTLFw05Ye{5{Aq1l4C
zKnh|W3^>WP8Ve>;@|_K=SfH(E<RW_J(Tt<r9fmcYCgm=!JP?odbVI9&dfU|vI<r_i
zx1MY%dmK)-iYlVOX=l!yp{@;7f4--6zw*}JtF1?0#SDJFK_eVt@A!PLz4G<Yr(PdS
z#cYpDT}cc6Vj+gGYqRmp&@9DxzRv0CYMHT|`&gWwRcEI^8C8&WVu{<}eN31UOwz<1
zZ>BxRht0ZROkD8_^fXk<ygfhi_B~}Bm%HRSd)?20%o;RWqqVmqbGmVds~uSXi&#$k
zXD_B7I4{JL-z@)7do8(RTD^AP@)7n?>;U)PKJ0$}e6nnyivqk6@ll$9luz%LKB647
z`sGl-a7Nl}vWn|nfuYHSVBQDwIAf^-DXys%d_~ghjOk#owYvqc^_uRdvE?TRt@;1J
zp!u4!b_PDMwz9zPu@s)62<)1&B-SMilFok_B$;MYw~m8kNxG)4hwB9CX13$KsPU7V
zl#hB~yaPFnttB7B7Rn8g)?{l@aaRR=*e`)*l>tA{=ZSWf`xWib{a}l1o04}D{si;Y
zCEbOFnC`Pbb8lS5vUKR<kHQMLbp>$S6x<IrU_m)Z4(0r?8ATO5=NOPp9~x2AK_Tnb
zt5gF6gULq+{HB5oa?DphJX1r(UUL=rmbH&@hCm_;{?}V+Mk>dsBt&qQkG07dTfcIN
zOYnRZXZj;c>F3?w8NmlsF*PhKyYB0p*D!tuk3AZ_o~9KH^V_oT$#3_~?=R|~px&p)
z{BobD@7OB2#_KZ&UmFZR$XY5lY4MFdYR0tA4G&wh`=pDfP+fQYc_KoMAs?3sX4|Ny
zga%tBY{0h8pKO1HdwR%fbLRf}V@TlolBW5Z|5Bd%nY>gRbhr5`{ote3rN6TI;O7dL
z(}s=SUg0`qAhB;=#-hu9Qh%`fN%o)Du%RVT1q9LRf_$Mh+~+yhBbuU?Hj7XaLEz=l
zK5ll+kc0b}L8`9M8wDHP(3X*VNj%@;HqV`zJjVmjnehD$57b#<9iK3<u{OY$^N415
z8f{MF;d)&+w6`4vTDXBdm*uZCup=PnaQP+H+}R{xy*L8ohqj5*<7^j>rc@b+riU3F
zmfgA`Fd|xXxJUn~ROxS%*6%NZNkD!1(fi^go6ZgcgUny-!LW}Uv`0aLLsckDh2Jf#
zrpqRMKoALX0Q2{Mg{bRtubJAxXaFP?bY89XXperjOz9tY(;@J4@P&`R9;&y&YO3wl
zJlc3nYq&$4w+5v2^ZxVT8n6M+*X2R2(K!BjHjY$e*k)tIYbgWeldf<6TQyTp`2|c_
z@ig1-qMMRhzlAx7eSBZd*G1%SVebFxFR1r!t8jG@34QuoXwxOxf-<jrtbAwVo2<O`
z>yIi4fr&NyH{IVu0A~Y#n|S-ax&ts4`n9MG6qdrVSD$HKh<&H`-u(1<WQ@CW(kc5F
z0DyJ6yU5cj1Jt;^W_o@IVFuw=m;<B#ii~X#c$bdZ?-QbaB{VzxnDD%~f5){u4)cij
z{@k*J-AY}?U)xd(wD(LFurYvWURRFs>^lRXWtNn9m(jHHKPPn<gun>5&uNp{LLY{h
zudft1_nj^V8K&!eYO&nGscnW4OE%lks}+KUvcwp2OYtJr22T<g{iDELk_SrXvOn_W
zuF$}(l5VDrrERA#Y-DtN7N2y#QEFZj<Y!`z@f07rahBNSrT@cbmGX77C36_cn(^A?
zh5|`lvb7`1Fpj#faG6t&-pgud0OOz0UBx%-l1r1vq8tc@%Gd{U@>G|#XPe$3{|56?
zdSGD#^xo>=)*5mcJ%xk&;^o7Bs&M|?#J77G?ar!j%C{4LuA56R6+BVbrd}wqNlE1C
zMORX<-TY+1G`gkACjwg?dP$xh3K-h_7XBjpT-Dk8E-H3<Kj7bPO-}_K*E^fw0j~op
zZuPdAO0Cs9GMk%8o%98kz!Xfkq4j8Y4r<Q-m?Wk=QYLd26|DH>K4D??Dpq7ptalT#
zQ2j1fYa41`gC%?DA#NulWAf2OBN;rBD4bo4MfHlE#YZb<8aBte(BqB;I5p@7cz>OG
zRaYjUH7*=XwDNv{8d4{syEHb+Jpmo}%!Jt+71zo)>jd-8%&rPY;pu<|9T)WS!Udcf
zkXcR-Ej?O|A2@ox0qYon74EIx90Ga)H9|TcDEADUP&y2*GJ4FTi`knRt+<VivHv83
zQ<bI2BJHb*)70bbxnJO23%x>|)yd};W!4ypx4vAL^o>l$p_>wL-i@=Ao{jAyGvC`c
zARPucl|7t`k36%=6AcQyma8p%*3|EP)XmLE&f5?HPb<msfWcEXhY5;?y{}o>tvwb6
z_HXF)0vnYX!c2&A7a>SAYo8~TwDb1yTa3LT^Yw;QJW9l3zVD98&<adW5}xnn6_Da_
zFkpBZHIrda=y?uT!m;l)=3adr#GJk}O(lrW6zieOi{t|7<y@XmU&JvAy5MUQ))rLi
zocH7x;hyLR;ve<A)v5G@vFsR_?3@-#%tZ!mW;4a=R<oem9~D_PSw!edcK+E@OlrbK
zJlSQDwX111`{aiCo35O~zKhTH*kUVJ<LE_qo@HGrnR&qgY8wyLclk_!&6)@q-;_Xh
zK_I>J6<s=7lis6-7B9prx%2-ePrU;`nV5$ysXHWjS#iU*QDrR^iJzRpJJSums!g=l
ztY#tVajVo3Q`i1Gr0gC$Ce1xU7DedvFV48>B^{d|;aJo&;3aK7>Yhqmu${ALY>1Py
zk#9me$BSO?Rz8(|8^b7U9^jGQYTkLw6+LYrkEm2b%Z{Xiy7WjP!>TnEH5uYf9p^5>
z=~2P-<HRY}IshAMN|<%2Mfx=b^GR=gX_~|69N?4Q4xvLT0z_SxglYUUXjNO119k4C
zR`!)%g)WMGMb3q#J6-8F>4S-#r`LM-cfGrCQUyzTU36<y7m+b|by48J9qi|0`pt5?
zHjT$aCg7EpL9^T!`cC*8_W>v2HEr1zG&)+3myOw_DAQwcRI#|*Uy(<%H|3VZ8FKHQ
zteL`;SVm*&wDb3xnW}YpjX~yjrL6v!EcBmUpA0opavH)eXk4h$C%EQ|$!3-!S!?g)
z6#0aupgcJ2ERfwT)6GFo{FdDp^e<-v+_ov;stDiKo+F_NK{+I|v{EvIQ?zHm1|IY^
z`;s~m%*eodujt*NQ!z8h%L%q4l^)b1u#u%$a=A@N7Jtcb+mmcSJRU0+M_c+JcH}XG
zot>u&U7bK^r`nJF^3~}4XoFf9Y4Zgmpl;PG<5OIMr6J~>Lhl_ImGkaa{4X(UU)fYX
z+M7_ve>@8}-DvQpL_eGPdKcc8Cy>xPq?dWU_2C?wpHN%z1S#mYmWoYOLeVlM$A$Ss
z<2lyxR2Fg|2i_Z`BuX}1S4i!zoc9VkOFOY{)s=m%HclQDJw61<bQdG{PKPZvXtd@Q
zf-K*+1w9{<tb$;QcaAwIvo1>+rTvbT0mET5H`{E7cPf>!@X%rd)riPm7XNFFwFv2E
z%!iT^Y!LzmGU!}8k~Z;dV>CP$Cnw)j?AqMd&b#gFh`2~$vv{e6(3_RUiz+8}m!W^E
z;bw9V?%iVMRGd?-!mPahX&{nom5C1U5x!Mt_LY^^bSFlyOh>4F@R?%jW4oM+jNbbf
zuj%f9OA1y<J+4TX<O&<i8GPouf7mwl%R|`PwTO4`Vh!P~MWs5<3A#V+67Cy+d4B%o
z>HPJdMCBHzv0uM#`xH!9CNDXy>z#cab#kfsBq3g%IiB>oe?1OS92z`s#B|bLN_+E5
z9HSH*z<f78P2b3?vRR3GS?7M`1i^cHx^ZZnY0hvTys>nQ;Z-r4?>1kmHHzS)<DCe8
z7VE!`lI5t$!5;%BWhl!RhpjR7W2;PLfb2KRGQ_E3THQoYxuo03*ZLkDQJyUMaMFTA
zb0||qZrfeQS1ECPbrRQyaCK7JA)y|^!pg?M#lIUD(nr-MvN!7wGLP}UpI=h#X0B<I
zjMYd_f0F1$O`{BoRlDiJ1nFwrNZQA~(e`%v_`Y1CvD(tA?5zK<Ub}He^tpkt)smAp
z=JJh3jSEmt=uc*mwsi5es;<Rc$0Ln(uKkv3UhSPrmHH|4{lf~~MA)QDv5E^CUA7h>
zA6$Bl_J)Kj{s~{6cWoSi&pNu+Mae5&$(9Eg3OP7!LBFilf2kD1=bu#(;k)O?6;g?h
zt>3MdfknDF{R8OQk?n-}2?P<Jai4}zTfR6tTCKJ6N*=L?arf?%@D*fF%g*1|30-jL
zkFC2W#gi&d3haJdb>#!&)z51ach+fBzc%t0^N+l$^ZdA{8a*?|l)?neToP#Oeo1eV
zL_ggib@yj7*P`QpS};fE*T$J*_QAW)_<0vOIYko2A6ch5GIKdGK+bRV8tuvv>C-Qy
z7TBUDg5bW4wctvr8jnDH^h(dsu41QBd|;8^5oTo)C4NqAK76%xyU39SEAi5Te&5;^
z8;3r<QA*T|1H8DBngnP@?`PHMH_Oqbjug>iCs%g5xERqSIrt9Rtjs&R|5H%r=KxkU
z-@4h+ae{B&xlURhf4c=1?cp~U;Nm#vKM^@M7QXV;Tj0;dU*kD7H|)T0{dqp5O6H;j
zL$|JA=5FIgEQSHzy4#hMx_6<QILXtlT}Qifq%3kR5xfMqu@`ens1pN~PvtKz3M&U!
z&I;(+1rtAdjfyv&WTt%_dA)JDMWl}INCJ{XH{9}T-FR?7Vsf%vnfI);k&#i;i6{C%
zHIU6mm**4E%0XjS_P8Q@x^cZs;%J<$t!?8YfunsE>m#XXqF}Oo@|hp~7mi;$lF(w9
z2F$ea0Qg%t$MbM?L!9TjgUIT^e;!$hJVVxlbQvMfbD_W3PAH2raX-q;T*UO|atOX3
zx8j@9>47A1S4Ku9SNSa0DqCGk5c+M!b@<An)7kmC_NH~b?VvoPQiXZTsba}{T>Mqt
z6AFkyqu*98k@QdX;df9*o9n)QZ7@MNCs5Y1PB#&P@|A_l)JU5KO<YJT{Fwdt{^JKi
z$C~Mvh)p2@OWNP98}if;^@q_HpGVr`TI5TQi*WJ(Gti!@t51lt;*ECh{;00fCVp_J
zsbE9+*+i6Y(1~!l`8qY?!=PfOgT>s`>7)N%=W%Y<w`jqsW}O=k**xCDle43~p@RpG
zJ@pUTAI7K>r)ICNMC7)6L&Nw#hpFY~-+1tLW*^5z$>S$Qj$+DeDrMjA8PdlM?DAR=
zr)!{b&t~|#0v2M;{@l#tmf#>I1I-t2Ot5*#FFuK;m!_j{-a{8o^Jpw{GJ0%rSb5K+
zB7uJ{gn##aaPix0#wCtxhQ9VaG0-1GFCF7~we3C)=3VgmKW~-aqwO#k7yYvOC!Www
z>G}KJm6_*!-1Hk3-xpQeySsmy>5VBEs5X}`7VExs;LjC1geo?ro0DoQ-^<mlZ{@$9
zp-ziUPD+v;2j2RiJ9qBLmFfkjj<2JlqHG5M4AugGWxIp_dF-y5&ADSe<~N3w!RPlA
z9dV=7xfk>A303LBo-SjJTNgNXa-W}nnzCm|`Qt0w^&n7yWgJh$4UBrvX?7R)d(Y_q
z&#O^FJq27UO6!^k$Ih+iC!S{T&~|(*;9x}BAK&fMXPulsz}SfU)Q=9z?_a4mjKuN%
z8EXk_E_2w73|TfE4*YZRC34J%!lI{gTzvP3a=UUFR}|&b;;N@b%9}?EZBTzcKA9cI
z+Xy>V>vmp}ZWULc#uvn@pq!VS8%-&O(|(7o8V#|%!T)~Nr5sO}$EWx@|9!%K|0mRe
z&AQXPjsM?M`Oklz>#752w&>&i|K91}|5@R<$MBCc|8xI;e>Ves*O>Tr_n#Ak4r-vU
zK7qB(IQ;i_|Mw67dq@BGR{Za+_}>BY`}Oeu({}}f=T41gYv-5VS{Cq6=fc(Vxtce^
F{vXLl!wLWZ

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-client-creation.png b/docs/images/keycloak-client-creation.png
new file mode 100644
index 0000000000000000000000000000000000000000..0595b8df9bc703ddf4af574fe01051675ac3734e
GIT binary patch
literal 30187
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
E0dCP2kpKVy

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-client-creation2.png b/docs/images/keycloak-client-creation2.png
new file mode 100644
index 0000000000000000000000000000000000000000..96879a04da4352bffd9fc2d64b7afeed7309705e
GIT binary patch
literal 103961
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%0AqkIf_AeHG)?
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

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-client.png b/docs/images/keycloak-client.png
new file mode 100644
index 0000000000000000000000000000000000000000..f10fc95ce19385e5bcd94d72928df5e152c056e4
GIT binary patch
literal 82477
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
GBmM{Ns4F1=

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-gitlab-login.png b/docs/images/keycloak-gitlab-login.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d7933d6018128f93c3537f91ef936d37a74fd9f
GIT binary patch
literal 64875
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
Yb6?2Qa_+3DUCck7%LbYyf7(U-8=EfcivR!s

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-home.png b/docs/images/keycloak-home.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2adbed24fcf1f144a63028ad51c7ed8269955b2
GIT binary patch
literal 130397
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
N002ovPDHLkV1oAK_B#Lo

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-secret.png b/docs/images/keycloak-secret.png
new file mode 100644
index 0000000000000000000000000000000000000000..4af4960e5f2c4d48f7fb89f1b6afb018dbcd4333
GIT binary patch
literal 31083
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

literal 0
HcmV?d00001

diff --git a/docs/images/keycloak-users.png b/docs/images/keycloak-users.png
new file mode 100644
index 0000000000000000000000000000000000000000..6949e8212e006e9ca0af5a9112026784e343751a
GIT binary patch
literal 52223
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

literal 0
HcmV?d00001

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
new file mode 100644
index 000000000..23f3eb08d
--- /dev/null
+++ b/docs/keycloak-idp.md
@@ -0,0 +1,65 @@
+# Integrate Keycloak as a IDP with GitLab
+
+In this document, we will explain how to set up Keycloak and integrate it into GitLab.
+
+## Setting up Keycloak
+
+First, you need a client in Keycloak to authenticate with GitLab. You can start Keycloak by running `docker-compose up -d keycloak`.
+
+When Keycloak is running, log in using the `Administration console`. You can visit the Keycloak on the [local IP](http://localhost:10081) of your laptop.
+
+![Keycloak Home](images/keycloak-home.png)
+
+Next, create a client.
+
+![Keycloak client](images/keycloak-client.png)
+
+Fill in the following variables:
+
+![Keycloak client creation](images/keycloak-client-creation.png)
+
+Make access type confidential and enable service accounts and authorization.
+
+![Keycloak client creation](images/keycloak-client-creation2.png)
+
+Next, click save, get the client secret generated by Keycloak and start filling out the variables for GitLab in the docker-compose file.
+
+![Keycloak client secret](images/keycloak-secret.png)
+
+```yaml
+    - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
+    - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
+    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
+    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
+    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
+    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
+```
+
+Make sure the following variables are filled in the docker-compose file:
+
+```yaml
+    - GITLAB_HOST='<your-ip-address>'
+    ...
+    - OAUTH_ENABLED=true
+    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
+    - OAUTH_ALLOW_SSO=Keycloak
+    - OAUTH_BLOCK_AUTO_CREATED_USERS=false
+    - OAUTH_AUTO_LINK_LDAP_USER=false
+    - OAUTH_AUTO_LINK_SAML_USER=false
+    - OAUTH_EXTERNAL_PROVIDERS=Keycloak
+```
+
+GitLab does not allow login from users in Keycloak with an empty email or name. To prevent this, you can create a new user in Keycloak or you can add email and name for the admin account.
+
+Visit the `Users` tab and click on `View all users` to modify the Admin user.
+
+![keycloak-users](images/keycloak-users.png)
+
+Modify the `Email`, `First name` and `Last Name` fields.
+![admin-account](images/keycloak-admin-acc.png)
+
+Deploy GitLab, Reddis and PostgreSQL by running the following command: `docker-compose up -d gitlab redis postgresql`.
+
+You can now login on the local GitLab instance with with Keycloak on your [local IP](http://localhost:10080).
+
+![gitlab-login](images/keycloak-gitlab-login.png)
\ No newline at end of file

From 755e3f75c554618cdce1a5aa748cd9c9a40c74f5 Mon Sep 17 00:00:00 2001
From: Evgeny Litvinov <elitvinov@tradingview.com>
Date: Fri, 13 Mar 2020 13:09:04 +0300
Subject: [PATCH 0424/1124] Add logging for backup operations to file
 ${GITLAB_LOG_DIR}/gitlab/gitlab-backup.log

---
 assets/runtime/functions | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index eb37c4571..6d90d88ad 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -769,19 +769,20 @@ gitlab_configure_backups_schedule() {
     daily|weekly|monthly)
       if ! crontab -u ${GITLAB_USER} -l >/tmp/cron.${GITLAB_USER} 2>/dev/null || ! grep -q 'bundle exec rake gitlab:backup:create' /tmp/cron.${GITLAB_USER}; then
         echo "Configuring gitlab::backups::schedule..."
-        read hour min <<< ${GITLAB_BACKUP_TIME//[:]/ }
-        day_of_month=*
-        month=*
-        day_of_week=*
+        gitlab_backup_log="${GITLAB_LOG_DIR}/gitlab/gitlab-backup.log"
+        read -r hour min <<< "${GITLAB_BACKUP_TIME//[:]/ }"
+        day_of_month="*"
+        month="*"
+        day_of_week="*"
         case ${GITLAB_BACKUP_SCHEDULE} in
           daily) ;;
           weekly) day_of_week=0 ;;
           monthly) day_of_month=01 ;;
         esac
         if [[ -n ${GITLAB_BACKUP_DIR_GROUP} ]]; then
-            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
+            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}' >> ${gitlab_backup_log} 2>&1" >> "/tmp/cron.${GITLAB_USER}"
         else
-            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER}
+            echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}' >> ${gitlab_backup_log} 2>&1" >> "/tmp/cron.${GITLAB_USER}"
         fi
         crontab -u ${GITLAB_USER} /tmp/cron.${GITLAB_USER}
       fi

From a3c922c2659c10bf012cb104c0f769ace18a6616 Mon Sep 17 00:00:00 2001
From: Alessandro Trisolini <ale.triso@gmail.com>
Date: Fri, 27 Mar 2020 19:50:17 +0100
Subject: [PATCH 0425/1124] Upgrade GitLab CE to 12.7.8 (#2106)

Co-authored-by: Alessandro Trisolini <alessandro@unumotors.com>
---
 Changelog.md               |  5 +++-
 Dockerfile                 |  2 +-
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e69f0ca25..5565a6663 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**12.7.7**
+**12.7.8*
+- Upgrade GitLab CE to 12.7.8
+
+**12.7.7*
 - Upgrade GitLab CE to 12.7.7
 
 **12.7.6**
diff --git a/Dockerfile b/Dockerfile
index 4d8f1a0e1..be42fa04b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191202
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.7
+ARG VERSION=12.7.8
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index adead22f2..f0b0b2a84 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.7
+# sameersbn/gitlab:12.7.8
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.7
+docker pull sameersbn/gitlab:12.7.8
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 ## Database
@@ -266,7 +266,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 #### Linking to PostgreSQL Container
@@ -310,7 +310,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -337,7 +337,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 ### Linking to Redis Container
@@ -364,7 +364,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 ### Mail
@@ -377,7 +377,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -397,7 +397,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -474,7 +474,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -490,7 +490,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.7
+ sameersbn/gitlab:12.7.8
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -513,7 +513,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -561,7 +561,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -742,14 +742,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.7
+    sameersbn/gitlab:12.7.8
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:sanitize
+    sameersbn/gitlab:12.7.8 app:sanitize
 ```
 
 ### Piwik
@@ -1126,7 +1126,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1161,14 +1161,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake db:setup
+    sameersbn/gitlab:12.7.8 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1177,7 +1177,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1227,7 +1227,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:env:info
+    sameersbn/gitlab:12.7.8 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1240,7 +1240,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.8 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1271,7 +1271,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.7.8 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1293,12 +1293,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.7.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.7
+docker pull sameersbn/gitlab:12.7.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1324,7 +1324,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.8
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 5660ff109..f92b54868 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.7
+12.7.8
diff --git a/docker-compose.yml b/docker-compose.yml
index 2948d98f0..e48bf42ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.7
+    image: sameersbn/gitlab:12.7.8
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 174df05c3..03045ce0a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.7
+docker pull sameersbn/gitlab:12.7.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.7
+sameersbn/gitlab:12.7.8
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7b483b43e..8eeacae43 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.7
+        image: sameersbn/gitlab:12.7.8
         env:
         - name: TZ
           value: Asia/Kolkata

From a6e972e7fa30d71001b228822e6a88276aba049f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 27 Mar 2020 19:56:20 +0100
Subject: [PATCH 0426/1124] release 12.7.8


From 67a5fc30b42cd41dc1ab394c4bcdc53a570d7647 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:29:09 +0200
Subject: [PATCH 0427/1124] Upgrade to 12.8.0 (#2090)

* Upgrade GitLab CE to 12.8.0

* Update gitlab-workhorse to 8.21.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-pages to 1.16.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.8.0

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: gitaly-hooks missing symlink

Signed-off-by: solidnerd <niclas@mietz.io>

* chore(base-image): update base image to 20200219

* fix: unicorn worker limits

Signed-off-by: solidnerd <niclas@mietz.io>

* fix(ci): disable caching

Signed-off-by: solidnerd <niclas@mietz.io>

* feat: add patch support for gitlab during the installation

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not a supported controller name

Closes #2101

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: add fix for upstream gitaly problems during a fresh install

Signed-off-by: solidnerd <niclas@mietz.io>

* chore: update changelog.md
---
 .circleci/config.yml                          | 27 ---------
 Changelog.md                                  | 12 +++-
 Dockerfile                                    | 10 ++--
 README.md                                     | 56 +++++++++----------
 VERSION                                       |  2 +-
 assets/build/install.sh                       |  9 +++
 ...ecking-for-gitaly-on-a-fresh-install.patch | 33 +++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml     |  3 +-
 assets/runtime/env-defaults                   |  6 +-
 assets/runtime/functions                      |  2 +
 docker-compose.yml                            |  2 +-
 docs/container_registry.md                    | 10 ++--
 kubernetes/gitlab-rc.yml                      |  2 +-
 13 files changed, 99 insertions(+), 75 deletions(-)
 create mode 100644 assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7a542350..4d9332eff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,23 +34,6 @@ jobs:
             docker version
             docker info
 
-      - restore_cache:
-          keys:
-            - cache-v2-{{ .Branch }}
-          paths:
-            - /tmp/cache/layers.tar
-
-      - run:
-          name: Loading docker cache
-          command: |
-            if [[ -f /tmp/cache/layers.tar ]]; then
-              echo "Loading cache ..."
-              docker load -i /tmp/cache/layers.tar
-              docker image ls
-            else
-              echo "Couldn't find any caches"
-            fi
-
       - run:
           name: Build docker image
           command: |
@@ -74,16 +57,6 @@ jobs:
             docker run --network container:$(docker-compose ps -q gitlab) \
               appropriate/curl --ipv4 --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
 
-      - run:
-          name: Generate docker build image cache
-          command: |
-            mkdir -p /tmp/cache/
-            docker save -o /tmp/cache/layers.tar ${IMAGE_NAME}
-
-      - save_cache:
-          key: cache-v2-{{ .Branch }}
-          paths:
-            - /tmp/cache/layers.tar
 
 workflows:
   version: 2
diff --git a/Changelog.md b/Changelog.md
index 5565a6663..8ee39e126 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,10 +3,18 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**12.7.8*
+**12.8.0**
+- gitlab: upgrade CE to v12.8.0
+- fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
+
+**12.7.8**
 - Upgrade GitLab CE to 12.7.8
 
-**12.7.7*
+**12.7.7**
+- Upgrade GitLab CE to 12.7.7
+- Add Generic OAuth Provider PR#2070
+
+**12.7.7**
 - Upgrade GitLab CE to 12.7.7
 
 **12.7.6**
diff --git a/Dockerfile b/Dockerfile
index be42fa04b..1c8078d1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-FROM ubuntu:bionic-20191202
+FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.8
+ARG VERSION=12.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.7 \
     GITLAB_SHELL_VERSION=11.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.20.0 \
-    GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.83.0 \
+    GITLAB_WORKHORSE_VERSION=8.21.0 \
+    GITLAB_PAGES_VERSION=1.16.0 \
+    GITALY_SERVER_VERSION=12.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f0b0b2a84..1964a276c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.7.8
+# sameersbn/gitlab:12.8.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.7.8
+docker pull sameersbn/gitlab:12.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 ## Database
@@ -240,10 +240,6 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 ### PostgreSQL
 
-*NOTE:* PostgreSQL version 10 is highly recommended. 
-
-While the GitLab will most likely work with even latest version of PostgreSQL, it is recommended to use version 10.x.x., because this docker image includes some PostgreSQL tools from release 10. These tools are used for backups and other database maintenance tasks.
-
 #### External PostgreSQL Server
 
 The image also supports using an external PostgreSQL Server. This is also controlled via environment variables.
@@ -266,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -310,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -337,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 ### Linking to Redis Container
@@ -364,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 ### Mail
@@ -377,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -397,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -474,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -490,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.7.8
+ sameersbn/gitlab:12.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -513,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -561,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -742,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.7.8
+    sameersbn/gitlab:12.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:sanitize
+    sameersbn/gitlab:12.8.0 app:sanitize
 ```
 
 ### Piwik
@@ -1126,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1161,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake db:setup
+    sameersbn/gitlab:12.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1177,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1227,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1240,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1271,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1293,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.7.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.8
+docker pull sameersbn/gitlab:12.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1324,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.7.8
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index f92b54868..a54ec1fce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.8
+12.8.0
\ No newline at end of file
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 8eb05a1e5..67f3643bb 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -69,6 +69,11 @@ exec_as_git git config --global receive.advertisePushOptions true
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
 
+if [[ -d "${GITLAB_BUILD_DIR}/patches" ]]; then
+echo "Applying patches for gitlab-foss..."
+exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch
+fi
+
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
 GITLAB_WORKHORSE_VERSION=${GITLAB_WORKHOUSE_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_WORKHORSE_VERSION)}
 GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}
@@ -137,6 +142,10 @@ rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 echo "Linking $(command -v gitaly-ssh) to /"
 ln -s "$(command -v gitaly-ssh)" /
 
+# Fix for gitaly-hooks
+echo "Linking $(command -v gitaly-hooks) to /"
+ln -s "$(command -v gitaly-hooks)" /
+
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb
 
diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
new file mode 100644
index 000000000..29078a428
--- /dev/null
+++ b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
@@ -0,0 +1,33 @@
+From 36bf91a3fd423d9ee564ae669a271c714362d648 Mon Sep 17 00:00:00 2001
+From: solidnerd <niclas@mietz.io>
+Date: Sun, 29 Mar 2020 11:14:40 +0200
+Subject: [PATCH] fix: feature checking for gitaly on a fresh install
+
+Signed-off-by: solidnerd <niclas@mietz.io>
+---
+ lib/feature.rb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/feature.rb b/lib/feature.rb
+index aadc2c64957..1d39a921465 100644
+--- a/lib/feature.rb
++++ b/lib/feature.rb
+@@ -33,6 +33,7 @@ class Feature
+ 
+     def persisted_names
+       return [] unless Gitlab::Database.exists?
++      return [] unless Feature::FlipperFeature.table_exists?
+ 
+       Gitlab::SafeRequestStore[:flipper_persisted_names] ||=
+         begin
+@@ -57,6 +58,7 @@ class Feature
+       # During setup the database does not exist yet. So we haven't stored a value
+       # for the feature yet and return the default.
+       return default_enabled unless Gitlab::Database.exists?
++      return default_enabled unless Feature::FlipperFeature.table_exists?
+ 
+       feature = Feature.get(key)
+ 
+-- 
+2.25.2
+
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index c0dc782e7..e648be921 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -590,8 +590,7 @@ production: &base
               email: '{{OAUTH2_GENERIC_USER_EMAIL}}'
               }
             },
-            name: '{{OAUTH2_GENERIC_NAME}}'
-          }}
+            name: '{{OAUTH2_GENERIC_NAME}}' }}
       - { name: 'azure_oauth2',
           args: {
             client_id: '{{OAUTH_AZURE_API_KEY}}',
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 4dcd3976f..2bf7c9bb6 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -65,7 +65,11 @@ GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 UNICORN_WORKERS=${UNICORN_WORKERS:-3}
 UNICORN_TIMEOUT=${UNICORN_TIMEOUT:-60}
 
-GITLAB_UNICORN_MEMORY_MAX=${GITLAB_UNICORN_MEMORY_MAX:-524288000}
+# Set Default values according to the documentation
+# https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer
+GITLAB_UNICORN_MEMORY_MIN=${GITLAB_UNICORN_MEMORY_MIN:-1073741824}
+GITLAB_UNICORN_MEMORY_MAX=${GITLAB_UNICORN_MEMORY_MAX:-1342177280}
+
 
 ##
 GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index eb37c4571..aa3ef27ed 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -613,6 +613,8 @@ gitlab_configure_oauth2_generic() {
     OAUTH2_GENERIC_USER_NAME \
     OAUTH2_GENERIC_USER_EMAIL \
     OAUTH2_GENERIC_NAME
+  else 
+      exec_as_git sed -i "/name: 'oauth2_generic'/,/{{OAUTH2_GENERIC_NAME}}/d" ${GITLAB_CONFIG}
   fi
 }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e48bf42ec..6ed5f53ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.7.8
+    image: sameersbn/gitlab:12.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 03045ce0a..9ad83d065 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.7.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.7.8
+docker pull sameersbn/gitlab:12.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.7.8
+sameersbn/gitlab:12.8.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8eeacae43..372c72dea 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.7.8
+        image: sameersbn/gitlab:12.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 4e87065468563ac6a42aa7c41c6fbcb9fc94821e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:36:21 +0200
Subject: [PATCH 0428/1124] release 12.8.0


From 2a0f4dc46722327e6e551919fe091fe0f3edb920 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:38:37 +0200
Subject: [PATCH 0429/1124] Upgrade GitLab CE to 12.8.1 (#2108)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8ee39e126..0a91a86b1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.1**
+- gitlab: upgrade CE to v12.8.1
+
 **12.8.0**
 - gitlab: upgrade CE to v12.8.0
 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
diff --git a/Dockerfile b/Dockerfile
index 1c8078d1e..0eb11a204 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.0
+ARG VERSION=12.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.0 \
+    GITALY_SERVER_VERSION=12.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1964a276c..0cc89dac6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.0
+# sameersbn/gitlab:12.8.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.0
+docker pull sameersbn/gitlab:12.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.0
+ sameersbn/gitlab:12.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.0
+    sameersbn/gitlab:12.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:sanitize
+    sameersbn/gitlab:12.8.1 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake db:setup
+    sameersbn/gitlab:12.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.0
+docker pull sameersbn/gitlab:12.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a54ec1fce..94a033d46 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.0
\ No newline at end of file
+12.8.1
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ed5f53ca..d11ea9010 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.0
+    image: sameersbn/gitlab:12.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9ad83d065..90d128125 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.0
+docker pull sameersbn/gitlab:12.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.0
+sameersbn/gitlab:12.8.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 372c72dea..ac9024ffe 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.0
+        image: sameersbn/gitlab:12.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 965fc98ce2f4da5a67dc24dd0ed6b06483b011da Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:38:51 +0200
Subject: [PATCH 0430/1124] release 12.8.1


From 8c634c920e7f6eba9d8077f0a157f49675545b49 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:40:17 +0200
Subject: [PATCH 0431/1124] Upgrade GitLab CE to 12.8.2 (#2109)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0a91a86b1..c2456a1c2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.2**
+- gitlab: upgrade CE to v12.8.2
+
 **12.8.1**
 - gitlab: upgrade CE to v12.8.1
 
diff --git a/Dockerfile b/Dockerfile
index 0eb11a204..c7ac25ab8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.1
+ARG VERSION=12.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.1 \
+    GITALY_SERVER_VERSION=12.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0cc89dac6..3c773c772 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.1
+# sameersbn/gitlab:12.8.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.1
+docker pull sameersbn/gitlab:12.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.1
+ sameersbn/gitlab:12.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.1
+    sameersbn/gitlab:12.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:sanitize
+    sameersbn/gitlab:12.8.2 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake db:setup
+    sameersbn/gitlab:12.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.1
+docker pull sameersbn/gitlab:12.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 94a033d46..2e84a9277 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.1
\ No newline at end of file
+12.8.2
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d11ea9010..69897e48f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.1
+    image: sameersbn/gitlab:12.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 90d128125..0260f774c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.1
+docker pull sameersbn/gitlab:12.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.1
+sameersbn/gitlab:12.8.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ac9024ffe..a8f3f7502 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.1
+        image: sameersbn/gitlab:12.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 7d9e9d5603db33297578867d2c407b8f64d18b85 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:40:31 +0200
Subject: [PATCH 0432/1124] release 12.8.2


From d4641c433fbc3f285811495976187af15db259b5 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:41:56 +0200
Subject: [PATCH 0433/1124] Upgrade GitLab CE to 12.8.3 (#2110)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c2456a1c2..8a144b83f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.3**
+- gitlab: upgrade CE to v12.8.3
+
 **12.8.2**
 - gitlab: upgrade CE to v12.8.2
 
diff --git a/Dockerfile b/Dockerfile
index c7ac25ab8..7eb13cc69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.2
+ARG VERSION=12.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.2 \
+    GITALY_SERVER_VERSION=12.8.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3c773c772..be23cb8d6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.2
+# sameersbn/gitlab:12.8.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.2
+docker pull sameersbn/gitlab:12.8.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.2
+ sameersbn/gitlab:12.8.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.2
+    sameersbn/gitlab:12.8.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:sanitize
+    sameersbn/gitlab:12.8.3 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake db:setup
+    sameersbn/gitlab:12.8.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.2
+docker pull sameersbn/gitlab:12.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 2e84a9277..26d716c1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.2
\ No newline at end of file
+12.8.3
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 69897e48f..fbc94ef1b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.2
+    image: sameersbn/gitlab:12.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0260f774c..86c80cd71 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.2
+docker pull sameersbn/gitlab:12.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.2
+sameersbn/gitlab:12.8.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a8f3f7502..c85bff2c6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.2
+        image: sameersbn/gitlab:12.8.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 03c64f5334886bc562a24e184985f8c2cde08dbc Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:42:12 +0200
Subject: [PATCH 0434/1124] release 12.8.3


From 316807925116b9b61847cabf6e0da1de3da3d0af Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:44:20 +0200
Subject: [PATCH 0435/1124] Upgrade GitLab CE to 12.8.4 (#2111)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8a144b83f..c5d5bdbd7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.4**
+- gitlab: upgrade CE to v12.8.4
+
 **12.8.3**
 - gitlab: upgrade CE to v12.8.3
 
diff --git a/Dockerfile b/Dockerfile
index 7eb13cc69..f27ef1363 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.3
+ARG VERSION=12.8.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.3 \
+    GITALY_SERVER_VERSION=12.8.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index be23cb8d6..0b61e0f99 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.3
+# sameersbn/gitlab:12.8.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.3
+docker pull sameersbn/gitlab:12.8.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.3
+ sameersbn/gitlab:12.8.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.3
+    sameersbn/gitlab:12.8.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:sanitize
+    sameersbn/gitlab:12.8.4 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake db:setup
+    sameersbn/gitlab:12.8.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.3
+docker pull sameersbn/gitlab:12.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 26d716c1b..c825a4058 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.3
\ No newline at end of file
+12.8.4
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index fbc94ef1b..b9ed13dd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.3
+    image: sameersbn/gitlab:12.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 86c80cd71..404b9bc29 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.3
+docker pull sameersbn/gitlab:12.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.3
+sameersbn/gitlab:12.8.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c85bff2c6..aac8f64db 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.3
+        image: sameersbn/gitlab:12.8.4
         env:
         - name: TZ
           value: Asia/Kolkata

From ec4afcdcc3521042bf833263ee1479713ec67b1d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:44:34 +0200
Subject: [PATCH 0436/1124] release 12.8.4


From 47b9d6e3b749f1ac4cebd10c83909d20c1efce2e Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:46:11 +0200
Subject: [PATCH 0437/1124] Upgrade GitLab CE to 12.8.5 (#2112)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5d5bdbd7..dc0bdd93d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.5**
+- gitlab: upgrade CE to v12.8.5
+
 **12.8.4**
 - gitlab: upgrade CE to v12.8.4
 
diff --git a/Dockerfile b/Dockerfile
index f27ef1363..bd5ab4937 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.4
+ARG VERSION=12.8.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.4 \
+    GITALY_SERVER_VERSION=12.8.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0b61e0f99..f97b4f6e8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.4
+# sameersbn/gitlab:12.8.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.4
+docker pull sameersbn/gitlab:12.8.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.4
+ sameersbn/gitlab:12.8.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.4
+    sameersbn/gitlab:12.8.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:sanitize
+    sameersbn/gitlab:12.8.5 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake db:setup
+    sameersbn/gitlab:12.8.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.4
+docker pull sameersbn/gitlab:12.8.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index c825a4058..394812df7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.4
\ No newline at end of file
+12.8.5
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index b9ed13dd0..68e7963d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.4
+    image: sameersbn/gitlab:12.8.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 404b9bc29..607da6a8d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.4
+docker pull sameersbn/gitlab:12.8.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.4
+sameersbn/gitlab:12.8.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index aac8f64db..540688d72 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.4
+        image: sameersbn/gitlab:12.8.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 05240f0c4e2eebf15f880c18cc888ea372905fd1 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:46:26 +0200
Subject: [PATCH 0438/1124] release 12.8.5


From 0c3da9db72aa88e7738f1161a2b4bc8e46ce9ada Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:47:45 +0200
Subject: [PATCH 0439/1124] Upgrade GitLab CE to 12.8.6 (#2113)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dc0bdd93d..e5a890a43 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.6**
+- gitlab: upgrade CE to v12.8.6
+
 **12.8.5**
 - gitlab: upgrade CE to v12.8.5
 
diff --git a/Dockerfile b/Dockerfile
index bd5ab4937..7aaa758da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.5
+ARG VERSION=12.8.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.5 \
+    GITALY_SERVER_VERSION=12.8.6 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f97b4f6e8..b8e45b599 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.5
+# sameersbn/gitlab:12.8.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.5
+docker pull sameersbn/gitlab:12.8.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.5
+ sameersbn/gitlab:12.8.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.5
+    sameersbn/gitlab:12.8.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:sanitize
+    sameersbn/gitlab:12.8.6 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake db:setup
+    sameersbn/gitlab:12.8.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.5
+docker pull sameersbn/gitlab:12.8.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 394812df7..ef6940832 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.5
\ No newline at end of file
+12.8.6
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 68e7963d5..86ac987da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.5
+    image: sameersbn/gitlab:12.8.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 607da6a8d..dcb487054 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.5
+docker pull sameersbn/gitlab:12.8.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.5
+sameersbn/gitlab:12.8.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 540688d72..0a92ec703 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.5
+        image: sameersbn/gitlab:12.8.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 4554637b1fb8c1f7f494cc74d0b57cab6daab32f Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:48:04 +0200
Subject: [PATCH 0440/1124] release 12.8.6


From 478a8ea73664d2977adb30125f7436a1a1ad736a Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:49:48 +0200
Subject: [PATCH 0441/1124] Upgrade GitLab CE to 12.8.7 (#2114)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e5a890a43..fe268dc4d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.7**
+- gitlab: upgrade CE to v12.8.7
+
 **12.8.6**
 - gitlab: upgrade CE to v12.8.6
 
diff --git a/Dockerfile b/Dockerfile
index 7aaa758da..497ba84c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.6
+ARG VERSION=12.8.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=11.0.0 \
     GITLAB_WORKHORSE_VERSION=8.21.0 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.6 \
+    GITALY_SERVER_VERSION=12.8.7 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b8e45b599..50f0d585b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.6
+# sameersbn/gitlab:12.8.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.6
+docker pull sameersbn/gitlab:12.8.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.6
+ sameersbn/gitlab:12.8.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.6
+    sameersbn/gitlab:12.8.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:sanitize
+    sameersbn/gitlab:12.8.7 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake db:setup
+    sameersbn/gitlab:12.8.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.6
+docker pull sameersbn/gitlab:12.8.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.7
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index ef6940832..816147054 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.6
\ No newline at end of file
+12.8.7
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 86ac987da..3e914b2ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.6
+    image: sameersbn/gitlab:12.8.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index dcb487054..3879ecda0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.6
+docker pull sameersbn/gitlab:12.8.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.6
+sameersbn/gitlab:12.8.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0a92ec703..139021874 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.6
+        image: sameersbn/gitlab:12.8.7
         env:
         - name: TZ
           value: Asia/Kolkata

From 1e061ae56d5d1ab654cb77e3d7971fd28f0d98ef Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:50:02 +0200
Subject: [PATCH 0442/1124] release 12.8.7


From 2356fd3de6d24b72c36b3a1f46bad9cd2471991f Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:51:31 +0200
Subject: [PATCH 0443/1124] Upgrade to 12.8.8 (#2115)

* Upgrade GitLab CE to 12.8.8

* Update gitlab-workhorse to 8.21.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 +++
 Dockerfile                 |  6 ++---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fe268dc4d..22a171231 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.8.8**
+- gitlab: upgrade CE to v12.8.8
+
 **12.8.7**
 - gitlab: upgrade CE to v12.8.7
 
diff --git a/Dockerfile b/Dockerfile
index 497ba84c0..9a74c0350 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,15 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.7
+ARG VERSION=12.8.8
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.7 \
     GITLAB_SHELL_VERSION=11.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.21.0 \
+    GITLAB_WORKHORSE_VERSION=8.21.1 \
     GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.7 \
+    GITALY_SERVER_VERSION=12.8.8 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 50f0d585b..1d864b5dd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.7
+# sameersbn/gitlab:12.8.8
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.7
+docker pull sameersbn/gitlab:12.8.8
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.7
+ sameersbn/gitlab:12.8.8
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.7
+    sameersbn/gitlab:12.8.8
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:sanitize
+    sameersbn/gitlab:12.8.8 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake db:setup
+    sameersbn/gitlab:12.8.8 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:env:info
+    sameersbn/gitlab:12.8.8 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.8 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.8.8 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.8.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.7
+docker pull sameersbn/gitlab:12.8.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.8
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 816147054..99631b599 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.7
\ No newline at end of file
+12.8.8
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e914b2ff..5348de239 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.7
+    image: sameersbn/gitlab:12.8.8
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3879ecda0..d5d1093cc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.7
+docker pull sameersbn/gitlab:12.8.8
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.7
+sameersbn/gitlab:12.8.8
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 139021874..38eff2393 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.7
+        image: sameersbn/gitlab:12.8.8
         env:
         - name: TZ
           value: Asia/Kolkata

From 5f1c5129fff287ffea6b61cc607579d42112eb46 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 29 Mar 2020 15:51:49 +0200
Subject: [PATCH 0444/1124] release 12.8.8


From e87f29c2a3737d2a779e09129ad993456d4421a2 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:08:52 +0200
Subject: [PATCH 0445/1124] Upgrade to 12.9.0 (#2117)

* Upgrade GitLab CE to 12.9.0

* Update gitlab-shell to 12.0.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-workhorse to 8.25.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-pages to 1.17.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.9.0-rc42

Signed-off-by: solidnerd <niclas@mietz.io>

* feat: replace unicorn with puma as webserver

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md                              |  10 ++
 Dockerfile                                |  10 +-
 README.md                                 |  52 ++++-----
 VERSION                                   |   2 +-
 assets/build/install.sh                   |   9 +-
 assets/runtime/config/gitlabhq/puma.rb    |  88 ++++++++++++++
 assets/runtime/config/gitlabhq/unicorn.rb | 133 ----------------------
 assets/runtime/env-defaults               |   8 +-
 assets/runtime/functions                  |  28 +++--
 docker-compose.yml                        |   2 +-
 docs/container_registry.md                |  10 +-
 kubernetes/gitlab-rc.yml                  |   2 +-
 12 files changed, 164 insertions(+), 190 deletions(-)
 create mode 100644 assets/runtime/config/gitlabhq/puma.rb
 delete mode 100644 assets/runtime/config/gitlabhq/unicorn.rb

diff --git a/Changelog.md b/Changelog.md
index 22a171231..bf0f093e7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,16 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.9.0**
+- gitlab: upgrade CE to v12.9.0
+- replaced unicorn with puma
+- Removed `UNICORN_WORKERS`
+- Removed `UNICORN_TIMEOUT`
+- Added `PUMA_THREADS_MIN`
+- Added `PUMA_THREADS_MAX`
+- Added `PUMA_WORKERS`
+- Added `PUMA_TIMEOUT`
+
 **12.8.8**
 - gitlab: upgrade CE to v12.8.8
 
diff --git a/Dockerfile b/Dockerfile
index 9a74c0350..3db891556 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,15 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.8.8
+ARG VERSION=12.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.7 \
-    GITLAB_SHELL_VERSION=11.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.21.1 \
-    GITLAB_PAGES_VERSION=1.16.0 \
-    GITALY_SERVER_VERSION=12.8.8 \
+    GITLAB_SHELL_VERSION=12.0.0 \
+    GITLAB_WORKHORSE_VERSION=8.25.0 \
+    GITLAB_PAGES_VERSION=1.17.0 \
+    GITALY_SERVER_VERSION=12.9.0-rc42 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1d864b5dd..8f0a4012b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.8.8
+# sameersbn/gitlab:12.9.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.8.8
+docker pull sameersbn/gitlab:12.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.8.8
+ sameersbn/gitlab:12.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.8.8
+    sameersbn/gitlab:12.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:sanitize
+    sameersbn/gitlab:12.9.0 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake db:setup
+    sameersbn/gitlab:12.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.8.8` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.8
+docker pull sameersbn/gitlab:12.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.8.8
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 99631b599..3eb7353bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.8.8
\ No newline at end of file
+12.9.0
\ No newline at end of file
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 67f3643bb..250ae6821 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -287,13 +287,12 @@ ${GITLAB_LOG_DIR}/nginx/*.log {
 }
 EOF
 
-# configure supervisord to start unicorn
-cat > /etc/supervisor/conf.d/unicorn.conf <<EOF
-[program:unicorn]
+cat > /etc/supervisor/conf.d/puma.conf <<EOF
+[program:puma]
 priority=10
 directory=${GITLAB_INSTALL_DIR}
 environment=HOME=${GITLAB_HOME}
-command=bundle exec unicorn_rails -c ${GITLAB_INSTALL_DIR}/config/unicorn.rb -E ${RAILS_ENV}
+command=bundle exec puma --config ${GITLAB_INSTALL_DIR}/config/puma.rb --environment ${RAILS_ENV}
 user=git
 autostart=true
 autorestart=true
@@ -415,7 +414,7 @@ cat > /etc/supervisor/conf.d/groups.conf <<EOF
 programs=gitaly
 priority=5
 [group:gitlab]
-programs=unicorn,gitlab-workhorse
+programs=puma,gitlab-workhorse
 priority=10
 [group:gitlab_extensions]
 programs=sshd,nginx,mail_room,cron
diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
new file mode 100644
index 000000000..c9ec08406
--- /dev/null
+++ b/assets/runtime/config/gitlabhq/puma.rb
@@ -0,0 +1,88 @@
+
+# Relative URL support
+# WARNING: We recommend using an FQDN to host GitLab in a root path instead
+# of using a relative URL.
+# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
+# Uncomment and customize the following line to run in a non-root path
+#
+ENV['RAILS_RELATIVE_URL_ROOT'] = "{{GITLAB_RELATIVE_URL_ROOT}}"
+
+# frozen_string_literal: true
+
+# Load "path" as a rackup file.
+#
+# The default is "config.ru".
+#
+rackup 'config.ru'
+pidfile '{{GITLAB_INSTALL_DIR}}/tmp/pids/puma.pid'
+state_path '{{GITLAB_INSTALL_DIR}}/tmp/pids/puma.state'
+
+stdout_redirect '{{GITLAB_INSTALL_DIR}}/log/puma.stdout.log',
+  '{{GITLAB_INSTALL_DIR}}/log/puma.stderr.log',
+  true
+
+# Configure "min" to be the minimum number of threads to use to answer
+# requests and "max" the maximum.
+#
+# The default is "0, 16".
+#
+threads {{PUMA_THREADS_MIN}}, {{PUMA_THREADS_MAX}}
+
+# By default, workers accept all requests and queue them to pass to handlers.
+# When false, workers accept the number of simultaneous requests configured.
+#
+# Queueing requests generally improves performance, but can cause deadlocks if
+# the app is waiting on a request to itself. See https://github.com/puma/puma/issues/612
+#
+# When set to false this may require a reverse proxy to handle slow clients and
+# queue requests before they reach puma. This is due to disabling HTTP keepalive
+queue_requests false
+
+# Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
+# accepted protocols.
+bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket'
+bind 'tcp://127.0.0.1:8080'
+
+workers {{PUMA_WORKERS}}
+
+require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events"
+require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/puma_worker_killer_initializer"
+
+on_restart do
+  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+end
+
+before_fork do
+  # Signal to the puma killer
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
+
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
+end
+
+Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
+on_worker_boot do
+  # Signal application hooks of worker start
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
+end
+
+# Preload the application before starting the workers; this conflicts with
+# phased restart feature. (off by default)
+preload_app!
+
+tag 'gitlab-puma-worker'
+
+# Verifies that all workers have checked in to the master process within
+# the given timeout. If not the worker process will be restarted. Default
+# value is 60 seconds.
+#
+worker_timeout {{PUMA_TIMEOUT}}
+
+# Use json formatter
+require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma_logging/json_formatter"
+
+json_formatter = Gitlab::PumaLogging::JSONFormatter.new
+log_formatter do |str|
+  json_formatter.call(str)
+end
diff --git a/assets/runtime/config/gitlabhq/unicorn.rb b/assets/runtime/config/gitlabhq/unicorn.rb
deleted file mode 100644
index 3d62d74df..000000000
--- a/assets/runtime/config/gitlabhq/unicorn.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# Sample verbose configuration file for Unicorn (not Rack)
-#
-# This configuration file documents many features of Unicorn
-# that may not be needed for some applications. See
-# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
-# for a much simpler configuration file.
-#
-# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
-# documentation.
-
-# Note: If you change this file in a Merge Request, please also create a
-# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
-
-# Relative URL support
-# WARNING: We recommend using an FQDN to host GitLab in a root path instead
-# of using a relative URL.
-# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
-# Uncomment and customize the following line to run in a non-root path
-#
-ENV['RAILS_RELATIVE_URL_ROOT'] = "{{GITLAB_RELATIVE_URL_ROOT}}"
-
-# Read about unicorn workers here:
-# http://doc.gitlab.com/ee/install/requirements.html#unicorn-workers
-#
-worker_processes {{UNICORN_WORKERS}}
-
-# Since Unicorn is never exposed to outside clients, it does not need to
-# run on the standard HTTP port (80), there is no reason to start Unicorn
-# as root unless it's from system init scripts.
-# If running the master process as root and the workers as an unprivileged
-# user, do this to switch euid/egid in the workers (also chowns logs):
-# user "unprivileged_user", "unprivileged_group"
-
-# Help ensure your application will always spawn in the symlinked
-# "current" directory that Capistrano sets up.
-working_directory "{{GITLAB_INSTALL_DIR}}" # available in 0.94.0+
-
-# Listen on both a Unix domain socket and a TCP port.
-# If you are load-balancing multiple Unicorn masters, lower the backlog
-# setting to e.g. 64 for faster failover.
-listen "{{GITLAB_INSTALL_DIR}}/tmp/sockets/gitlab.socket", :backlog => 1024
-listen "127.0.0.1:8080", :tcp_nopush => true
-
-# nuke workers after 30 seconds instead of 60 seconds (the default)
-#
-# NOTICE: git push over http depends on this value.
-# If you want to be able to push huge amount of data to git repository over http
-# you will have to increase this value too.
-#
-# Example of output if you try to push 1GB repo to GitLab over http.
-#   -> git push http://gitlab.... master
-#
-#   error: RPC failed; result=18, HTTP code = 200
-#   fatal: The remote end hung up unexpectedly
-#   fatal: The remote end hung up unexpectedly
-#
-# For more information see http://stackoverflow.com/a/21682112/752049
-#
-timeout {{UNICORN_TIMEOUT}}
-
-# feel free to point this anywhere accessible on the filesystem
-pid "{{GITLAB_INSTALL_DIR}}/tmp/pids/unicorn.pid"
-
-# By default, the Unicorn logger will write to stderr.
-# Additionally, some applications/frameworks log to stderr or stdout,
-# so prevent them from going to /dev/null when daemonized here:
-stderr_path "{{GITLAB_INSTALL_DIR}}/log/unicorn.stderr.log"
-stdout_path "{{GITLAB_INSTALL_DIR}}/log/unicorn.stdout.log"
-
-# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
-# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
-preload_app true
-GC.respond_to?(:copy_on_write_friendly=) and
-  GC.copy_on_write_friendly = true
-
-# Enable this flag to have unicorn test client connections by writing the
-# beginning of the HTTP headers before calling the application.  This
-# prevents calling the application for connections that have disconnected
-# while queued.  This is only guaranteed to detect clients on the same
-# host unicorn runs on, and unlikely to detect disconnects even on a
-# fast LAN.
-check_client_connection false
-
-before_fork do |server, worker|
-  # the following is highly recommended for Rails + "preload_app true"
-  # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-
-  # The following is only recommended for memory/DB-constrained
-  # installations.  It is not needed if your system can house
-  # twice as many worker_processes as you have configured.
-  #
-  # This allows a new master process to incrementally
-  # phase out the old master process with SIGTTOU to avoid a
-  # thundering herd (especially in the "preload_app false" case)
-  # when doing a transparent upgrade.  The last worker spawned
-  # will then kill off the old master process with a SIGQUIT.
-  old_pid = "#{server.config[:pid]}.oldbin"
-  if old_pid != server.pid
-    begin
-      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill(sig, File.read(old_pid).to_i)
-    rescue Errno::ENOENT, Errno::ESRCH
-    end
-  end
-  #
-  # Throttle the master from forking too quickly by sleeping.  Due
-  # to the implementation of standard Unix signal handlers, this
-  # helps (but does not completely) prevent identical, repeated signals
-  # from being lost when the receiving process is busy.
-  # sleep 1
-end
-
-after_fork do |server, worker|
-  # per-process listener ports for debugging/admin/migrations
-  # addr = "127.0.0.1:#{9293 + worker.nr}"
-  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-
-  # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-	
-  # reset prometheus client, this will cause any opened metrics files to be closed
-  defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
-    Prometheus::Client.reinitialize_on_pid_change
-
-  # if preload_app is true, then you may also want to check and
-  # restart any other shared sockets/descriptors such as Memcached,
-  # and Redis.  TokyoCabinet file handles are safe to reuse
-  # between any number of forked children (assuming your kernel
-  # correctly implements pread()/pwrite() system calls)
-end
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 2bf7c9bb6..e5a51b54a 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -61,9 +61,11 @@ SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
 SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
 GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 
-## UNICORN
-UNICORN_WORKERS=${UNICORN_WORKERS:-3}
-UNICORN_TIMEOUT=${UNICORN_TIMEOUT:-60}
+## PUMA
+PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1}
+PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16}
+PUMA_WORKERS=${PUMA_WORKERS:-3}
+PUMA_TIMEOUT=${PUMA_TIMEOUT:-60}
 
 # Set Default values according to the documentation
 # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer
diff --git a/assets/runtime/functions b/assets/runtime/functions
index aa3ef27ed..d81d3cb12 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -15,7 +15,7 @@ USERCONF_TEMPLATES_DIR="${GITLAB_DATA_DIR}/config"
 
 GITLAB_CONFIG="${GITLAB_INSTALL_DIR}/config/gitlab.yml"
 GITLAB_DATABASE_CONFIG="${GITLAB_INSTALL_DIR}/config/database.yml"
-GITLAB_UNICORN_CONFIG="${GITLAB_INSTALL_DIR}/config/unicorn.rb"
+GITLAB_PUMA_CONFIG="${GITLAB_INSTALL_DIR}/config/puma.rb"
 GITLAB_RELATIVE_URL_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/relative_url.rb"
 GITLAB_RACK_ATTACK_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/rack_attack.rb"
 GITLAB_SMTP_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/smtp_settings.rb"
@@ -262,18 +262,26 @@ gitlab_configure_gitlab_workhorse() {
     GITLAB_WORKHORSE_TIMEOUT
 }
 
-gitlab_configure_unicorn() {
-  echo "Configuring gitlab::unicorn..."
+gitlab_configure_puma() {
+  echo "Configuring gitlab::puma..."
   if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
-    update_template ${GITLAB_UNICORN_CONFIG} GITLAB_RELATIVE_URL_ROOT
+    update_template ${GITLAB_PUMA_CONFIG} GITLAB_RELATIVE_URL_ROOT
   else
-    exec_as_git sed -i "/{{GITLAB_RELATIVE_URL_ROOT}}/d" ${GITLAB_UNICORN_CONFIG}
+    exec_as_git sed -i "/{{GITLAB_RELATIVE_URL_ROOT}}/d" ${GITLAB_PUMA_CONFIG}
   fi
 
-  update_template ${GITLAB_UNICORN_CONFIG} \
+  update_template ${GITLAB_PUMA_CONFIG} \
     GITLAB_INSTALL_DIR \
-    UNICORN_WORKERS \
-    UNICORN_TIMEOUT
+    GITLAB_INSTALL_DIR \
+    GITLAB_INSTALL_DIR \
+    GITLAB_INSTALL_DIR \
+    PUMA_THREADS_MIN \
+    PUMA_THREADS_MAX \
+    PUMA_WORKERS \
+    GITLAB_INSTALL_DIR \
+    GITLAB_INSTALL_DIR \
+    PUMA_TIMEOUT \
+    GITLAB_INSTALL_DIR
 }
 
 gitlab_configure_relative_url() {
@@ -1511,7 +1519,7 @@ install_configuration_templates() {
   echo "Installing configuration templates..."
   install_template ${GITLAB_USER}: gitlabhq/gitlab.yml ${GITLAB_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/database.yml ${GITLAB_DATABASE_CONFIG} 0640
-  install_template ${GITLAB_USER}: gitlabhq/unicorn.rb ${GITLAB_UNICORN_CONFIG} 0644
+  install_template ${GITLAB_USER}: gitlabhq/puma.rb ${GITLAB_PUMA_CONFIG} 0644
   install_template ${GITLAB_USER}: gitlabhq/rack_attack.rb ${GITLAB_RACK_ATTACK_CONFIG} 0644
   install_template ${GITLAB_USER}: gitlabhq/resque.yml ${GITLAB_RESQUE_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/secrets.yml ${GITLAB_SECRETS_CONFIG} 0600
@@ -1614,7 +1622,7 @@ configure_gitlab() {
   gitlab_configure_gitlab_workhorse
   gitlab_configure_relative_url
   gitlab_configure_trusted_proxies
-  gitlab_configure_unicorn
+  gitlab_configure_puma
   gitlab_configure_timezone
   gitlab_configure_rack_attack
   gitlab_configure_ci
diff --git a/docker-compose.yml b/docker-compose.yml
index 5348de239..0ebe79384 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.8.8
+    image: sameersbn/gitlab:12.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d5d1093cc..faa26bf22 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.8.8 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.8.8
+docker pull sameersbn/gitlab:12.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.8.8
+sameersbn/gitlab:12.9.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 38eff2393..74873987f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.8.8
+        image: sameersbn/gitlab:12.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From f8599622460049d6d361d75b4f5115f55e57dee1 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:09:41 +0200
Subject: [PATCH 0446/1124] release 12.9.0


From 9905f90cbeb7750220e3d1e436b3fad5f5a6ec2a Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:12:31 +0200
Subject: [PATCH 0447/1124] Upgrade to 12.9.1 (#2118)

* Upgrade GitLab CE to 12.9.1

* Update gitlab-workhorse to 8.25.1

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.9.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md               |  3 +++
 Dockerfile                 |  6 ++---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bf0f093e7..e59c951a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.9.1**
+- gitlab: upgrade CE to v12.9.1
+
 **12.9.0**
 - gitlab: upgrade CE to v12.9.0
 - replaced unicorn with puma
diff --git a/Dockerfile b/Dockerfile
index 3db891556..980a24e62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,15 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.9.0
+ARG VERSION=12.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.7 \
     GITLAB_SHELL_VERSION=12.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.25.0 \
+    GITLAB_WORKHORSE_VERSION=8.25.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.9.0-rc42 \
+    GITALY_SERVER_VERSION=12.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8f0a4012b..d2229eb62 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.0
+# sameersbn/gitlab:12.9.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.9.0
+docker pull sameersbn/gitlab:12.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.0
+ sameersbn/gitlab:12.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.0
+    sameersbn/gitlab:12.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:sanitize
+    sameersbn/gitlab:12.9.1 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake db:setup
+    sameersbn/gitlab:12.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.0
+docker pull sameersbn/gitlab:12.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 3eb7353bc..65a979325 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.0
\ No newline at end of file
+12.9.1
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 0ebe79384..1cdc7e0c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.0
+    image: sameersbn/gitlab:12.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index faa26bf22..ffd31c229 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.0
+docker pull sameersbn/gitlab:12.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.0
+sameersbn/gitlab:12.9.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 74873987f..44fbe6cac 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.0
+        image: sameersbn/gitlab:12.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 14a49b694ac71ee4a0b0e417f654331207bdcbbf Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:12:51 +0200
Subject: [PATCH 0448/1124] release 12.9.1


From ba97667a84460ee14f697b16415239290f9f4150 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:14:24 +0200
Subject: [PATCH 0449/1124] Upgrade GitLab CE to 12.9.2 (#2119)

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e59c951a5..f28fa54a2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.9.2**
+- gitlab: upgrade CE to v12.9.2
+
 **12.9.1**
 - gitlab: upgrade CE to v12.9.1
 
diff --git a/Dockerfile b/Dockerfile
index 980a24e62..e29a5b1ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.9.1
+ARG VERSION=12.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.0.0 \
     GITLAB_WORKHORSE_VERSION=8.25.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.9.1 \
+    GITALY_SERVER_VERSION=12.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d2229eb62..8ccf7dce3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.1
+# sameersbn/gitlab:12.9.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.9.1
+docker pull sameersbn/gitlab:12.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.1
+ sameersbn/gitlab:12.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.1
+    sameersbn/gitlab:12.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:sanitize
+    sameersbn/gitlab:12.9.2 app:sanitize
 ```
 
 ### Piwik
@@ -1122,7 +1122,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1157,14 +1157,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake db:setup
+    sameersbn/gitlab:12.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1173,7 +1173,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1223,7 +1223,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1236,7 +1236,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1267,7 +1267,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1289,12 +1289,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.1
+docker pull sameersbn/gitlab:12.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1320,7 +1320,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 65a979325..b825d6d03 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.1
\ No newline at end of file
+12.9.2
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 1cdc7e0c6..e3a39197c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.1
+    image: sameersbn/gitlab:12.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ffd31c229..4146eed06 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.1
+docker pull sameersbn/gitlab:12.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.1
+sameersbn/gitlab:12.9.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 44fbe6cac..ca203da9c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.1
+        image: sameersbn/gitlab:12.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From c773d84f452a59a0ffd6c8374883c423c751174b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 4 Apr 2020 10:14:38 +0200
Subject: [PATCH 0450/1124] release 12.9.2


From c1e63f529cd6a2ef2c61ce7eb2b87eb2d230326f Mon Sep 17 00:00:00 2001
From: GO Sueyoshi <sue445@users.noreply.github.com>
Date: Fri, 10 Apr 2020 03:33:07 +0900
Subject: [PATCH 0451/1124] [Doc] Migrate doc for unicorn parameters to puma
 (#2123)

unicorn is removed at #2117
---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8ccf7dce3..a8832d8f8 100644
--- a/README.md
+++ b/README.md
@@ -929,8 +929,10 @@ Below is the complete list of available options that can be used to customize yo
 | `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` |
 | `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. |
 | `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. |
-| `UNICORN_WORKERS` | The number of unicorn workers to start. Defaults to `3`. |
-| `UNICORN_TIMEOUT` | Sets the timeout of unicorn worker processes. Defaults to `60` seconds. |
+| `PUMA_WORKERS` | The number of puma workers to start. Defaults to `3`. |
+| `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
+| `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
+| `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |

From c530f56eeb1c953ee520bcfff13353c6385662f0 Mon Sep 17 00:00:00 2001
From: GO Sueyoshi <sue445@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:27:58 +0900
Subject: [PATCH 0452/1124] Pass parameters of puma_worker_killer to puma
 config (#2124)

---
 README.md                              | 2 ++
 assets/runtime/config/gitlabhq/puma.rb | 2 +-
 assets/runtime/env-defaults            | 2 ++
 assets/runtime/functions               | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8832d8f8..7dfe31ce2 100644
--- a/README.md
+++ b/README.md
@@ -933,6 +933,8 @@ Below is the complete list of available options that can be used to customize yo
 | `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
 | `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
 | `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
+| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `850`. |
+| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `550`. |
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
index c9ec08406..b520e3fc9 100644
--- a/assets/runtime/config/gitlabhq/puma.rb
+++ b/assets/runtime/config/gitlabhq/puma.rb
@@ -55,7 +55,7 @@
 
 before_fork do
   # Signal to the puma killer
-  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options, puma_per_worker_max_memory_mb: {{PUMA_PER_WORKER_MAX_MEMORY_MB}}, puma_master_max_memory_mb: {{PUMA_MASTER_MAX_MEMORY_MB}}) unless ENV['DISABLE_PUMA_WORKER_KILLER']
 
   # Signal application hooks that we're about to fork
   Gitlab::Cluster::LifecycleEvents.do_before_fork
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index e5a51b54a..2410451bb 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -66,6 +66,8 @@ PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1}
 PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16}
 PUMA_WORKERS=${PUMA_WORKERS:-3}
 PUMA_TIMEOUT=${PUMA_TIMEOUT:-60}
+PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-850}
+PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-550}
 
 # Set Default values according to the documentation
 # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer
diff --git a/assets/runtime/functions b/assets/runtime/functions
index d81d3cb12..a9aed6ddd 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -278,6 +278,8 @@ gitlab_configure_puma() {
     PUMA_THREADS_MIN \
     PUMA_THREADS_MAX \
     PUMA_WORKERS \
+    PUMA_PER_WORKER_MAX_MEMORY_MB \
+    PUMA_MASTER_MAX_MEMORY_MB \
     GITLAB_INSTALL_DIR \
     GITLAB_INSTALL_DIR \
     PUMA_TIMEOUT \

From df71a7d5fa0494f0d580391ee5c7df177d5067ef Mon Sep 17 00:00:00 2001
From: Tom Dierckx <dierckx.t@telenet.be>
Date: Fri, 10 Apr 2020 10:38:21 +0200
Subject: [PATCH 0453/1124] allows generic name

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index d81d3cb12..d9d2a9f2f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -700,7 +700,7 @@ gitlab_configure_oauth() {
     OAUTH_EXTERNAL_PROVIDERS
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
-    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|oauth2_generic)
+    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|oauth2_generic|$OAUTH2_GENERIC_NAME)
       update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER
       ;;
     *)

From fe915dd9dd04e22a11cf293e34dd3eab71b34a2c Mon Sep 17 00:00:00 2001
From: "Klos, Jan" <jklos@netsuite.com>
Date: Fri, 24 Apr 2020 00:46:02 +0200
Subject: [PATCH 0454/1124] Upgrade gitlab to 12.9.4

---
 Changelog.md               |  5 ++++
 Dockerfile                 |  8 +++---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f28fa54a2..2c9b5b1da 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.9.4**
+- gitlab: upgrade CE to v12.9.4
+- Update gitlab-workhorse to 8.25.2
+- Update golang to 1.13.10
+
 **12.9.2**
 - gitlab: upgrade CE to v12.9.2
 
diff --git a/Dockerfile b/Dockerfile
index e29a5b1ab..8c224686c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,15 @@ FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.9.2
+ARG VERSION=12.9.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.13.7 \
+    GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=12.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.25.1 \
+    GITLAB_WORKHORSE_VERSION=8.25.2 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.9.2 \
+    GITALY_SERVER_VERSION=12.9.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 7dfe31ce2..aa4da7608 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.2
+# sameersbn/gitlab:12.9.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.9.2
+docker pull sameersbn/gitlab:12.9.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 ## Database
@@ -262,7 +262,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -306,7 +306,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -333,7 +333,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 ### Linking to Redis Container
@@ -360,7 +360,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 ### Mail
@@ -373,7 +373,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -393,7 +393,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -470,7 +470,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -486,7 +486,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.2
+ sameersbn/gitlab:12.9.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -509,7 +509,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -557,7 +557,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -738,14 +738,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.2
+    sameersbn/gitlab:12.9.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:sanitize
+    sameersbn/gitlab:12.9.4 app:sanitize
 ```
 
 ### Piwik
@@ -1126,7 +1126,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1161,14 +1161,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake db:setup
+    sameersbn/gitlab:12.9.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1177,7 +1177,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1227,7 +1227,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1240,7 +1240,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1271,7 +1271,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1293,12 +1293,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.2
+docker pull sameersbn/gitlab:12.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1324,7 +1324,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index b825d6d03..4e460fe7f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.2
\ No newline at end of file
+12.9.4
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e3a39197c..8e2985419 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.2
+    image: sameersbn/gitlab:12.9.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4146eed06..51de3dc6d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.2
+docker pull sameersbn/gitlab:12.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.2
+sameersbn/gitlab:12.9.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ca203da9c..fdad0344c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.2
+        image: sameersbn/gitlab:12.9.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 0317fe622e888178174ceae2eb427c1d9babc968 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Sun, 3 May 2020 10:04:00 +0530
Subject: [PATCH 0455/1124] readme: remove links to quay registry

The `assets:compile` rake task requests more memory than the quay.io
build machine can provide. As a result builds on quay.io have been
failing for a long time now.
---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index aa4da7608..722198123 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-[![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
 # sameersbn/gitlab:12.9.4
@@ -122,8 +121,6 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
-> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
-
 ```bash
 docker pull sameersbn/gitlab:12.9.4
 ```

From 452062d9fecd67b89485320bf4ef3a7a44fbdf19 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Sun, 3 May 2020 10:23:42 +0530
Subject: [PATCH 0456/1124] build: clean up build caches from `bundle` and `go`
 steps

---
 .gitignore              | 2 +-
 assets/build/install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23a34d320..b0d15890e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *.gem
 *.tar.gz
-
+*.tar.bz2
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 250ae6821..5acb8ffe2 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -64,7 +64,6 @@ exec_as_git git config --global gc.auto 0
 exec_as_git git config --global repack.writeBitmaps true
 exec_as_git git config --global receive.advertisePushOptions true
 
-
 # shallow clone gitlab-foss
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
@@ -156,6 +155,7 @@ cd ${GITLAB_INSTALL_DIR}
 
 # install gems, use local cache if available
 if [[ -d ${GEM_CACHE_DIR} ]]; then
+  echo "Found local npm package cache..."
   mv ${GEM_CACHE_DIR} ${GITLAB_INSTALL_DIR}/vendor/cache
   chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache
 fi
@@ -426,4 +426,4 @@ DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCI
 rm -rf /var/lib/apt/lists/*
 
 # clean up caches
-exec_as_git rm -rf ${GITLAB_HOME}/.cache
+rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go

From 3591a46ae7878236700a64bdc461a8f1c0602d69 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:31:45 +0530
Subject: [PATCH 0457/1124] dockerfile: move `ARG` lines to improve cache hits

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c224686c..61cb95603 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM ubuntu:bionic-20200219
 
-ARG BUILD_DATE
-ARG VCS_REF
 ARG VERSION=12.9.4
 
 ENV GITLAB_VERSION=${VERSION} \
@@ -63,6 +61,9 @@ COPY assets/runtime/ ${GITLAB_RUNTIME_DIR}/
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod 755 /sbin/entrypoint.sh
 
+ARG BUILD_DATE
+ARG VCS_REF
+
 LABEL \
     maintainer="sameer@damagehead.com" \
     org.label-schema.schema-version="1.0" \

From 1376fd027e8d26f2adfa9d7e4b3d141bfe2ac5fc Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:32:01 +0530
Subject: [PATCH 0458/1124] gitlab: updated to 12.9.5

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

diff --git a/Dockerfile b/Dockerfile
index 61cb95603..7991a7b7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200219
 
-ARG VERSION=12.9.4
+ARG VERSION=12.9.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \

From ccd8850ba5fdd01f5cfb6cac4c6fd279db495dc5 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:32:16 +0530
Subject: [PATCH 0459/1124] gitlab-shell: updated to 12.2.0

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

diff --git a/Dockerfile b/Dockerfile
index 7991a7b7a..27d547953 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=12.9.5
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
-    GITLAB_SHELL_VERSION=12.0.0 \
+    GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.25.2 \
     GITLAB_PAGES_VERSION=1.17.0 \
     GITALY_SERVER_VERSION=12.9.4 \

From f397ee24f4334fb167e8dfccb0fb49cdac72546b Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:32:34 +0530
Subject: [PATCH 0460/1124] gitaly: updated to 12.10.0

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

diff --git a/Dockerfile b/Dockerfile
index 27d547953..0f01dcf02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.25.2 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.9.4 \
+    GITALY_SERVER_VERSION=12.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 53ea2d736f2cb3f13b9a5ae38f14c90dcf9d015f Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:37:46 +0530
Subject: [PATCH 0461/1124] update docs for release

---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 722198123..700774904 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.4
+# sameersbn/gitlab:12.9.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -122,7 +122,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -191,7 +191,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -226,7 +226,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ## Database
@@ -259,7 +259,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -303,7 +303,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -330,7 +330,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ### Linking to Redis Container
@@ -357,7 +357,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ### Mail
@@ -370,7 +370,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -390,7 +390,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -467,7 +467,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -483,7 +483,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.4
+ sameersbn/gitlab:12.9.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -506,7 +506,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -554,7 +554,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -735,14 +735,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:sanitize
+    sameersbn/gitlab:12.9.5 app:sanitize
 ```
 
 ### Piwik
@@ -1123,7 +1123,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1158,14 +1158,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake db:setup
+    sameersbn/gitlab:12.9.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1174,7 +1174,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1224,7 +1224,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1237,7 +1237,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1268,7 +1268,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1290,12 +1290,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1321,7 +1321,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4e460fe7f..1a5d5efa2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.4
\ No newline at end of file
+12.9.5
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8e2985419..5a00c45d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.4
+    image: sameersbn/gitlab:12.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 51de3dc6d..5feceaca5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.4
+sameersbn/gitlab:12.9.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fdad0344c..83c48beee 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.4
+        image: sameersbn/gitlab:12.9.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 0cd4a358c481fb64da7427283081d8f14a4b6825 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:32:34 +0530
Subject: [PATCH 0462/1124] gitaly: updated to 12.10.0

---
 Dockerfile                               |  2 +-
 assets/runtime/config/gitaly/config.toml | 54 +++++++++++++++++++-----
 assets/runtime/functions                 |  7 ++-
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 27d547953..0f01dcf02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.25.2 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.9.4 \
+    GITALY_SERVER_VERSION=12.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index 88f846787..6e18163ca 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -1,18 +1,37 @@
 # Example Gitaly configuration file
+# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
+# https://docs.gitlab.com/ee//administration/gitaly/reference
 
 socket_path = "{{GITALY_SOCKET_PATH}}"
 
+# The directory where Gitaly's executables are stored
+bin_dir = "/usr/local/bin/"
+
 # # Optional: listen on a TCP socket. This is insecure (no authentication)
 # listen_addr = "localhost:9999"
-#
+# tls_listen_addr = "localhost:8888
 
 # # Optional: export metrics via Prometheus
 # prometheus_listen_addr = "localhost:9236"
-#
 
-# # Git executable settings
+# # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
+# # named temp directory each time it boots.
+# # Non Gitaly clients should never connect to these sockets.
+# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
+
+# # Optional: authenticate Gitaly requests using a shared secret
+# [auth]
+# token = 'abc123secret'
+# transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
+
+# [tls]
+# certificate_path = '/home/git/cert.cert'
+# key_path = '/home/git/key.pem'
+
+# # Git settings
 # [git]
 # bin_path = "/usr/bin/git"
+# catfile_cache_size = 100
 
 [[storage]]
 name = "default"
@@ -27,9 +46,18 @@ path = "{{GITLAB_REPOS_DIR}}"
 
 # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
 # [logging]
+# # The directory where Gitaly stores extra log files
+dir = "{{GITLAB_LOG_DIR}}"
 # format = "json"
-# # Additionally exceptions can be reported to Sentry
+# # Optional: Set log level to only log entries with that severity or above
+# # One of, in order: debug, info, warn, errror, fatal, panic
+# # Defaults to "info"
+# level = "warn"
+#
+# # Additionally exceptions from the Go server can be reported to Sentry
 # sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
+# # Exceptions from gitaly-ruby can also be reported to Sentry
+# ruby_sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
 
 # # You can optionally configure Gitaly to record histogram latencies on GRPC method calls
 # [prometheus]
@@ -37,21 +65,27 @@ path = "{{GITLAB_REPOS_DIR}}"
 
 [gitaly-ruby]
 # The directory where gitaly-ruby is installed
-dir = "/home/git/gitaly/ruby"
+dir = "{{GITLAB_GITALY_INSTALL_DIR}}/ruby"
 
 # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
-# max_rss = 300000000
-# 
+# max_rss = 200000000
+#
 # # Grace period before a gitaly-ruby process is forcibly terminated after exceeding max_rss (seconds)
 # graceful_restart_timeout = "10m"
-# 
+#
 # # Time that gitaly-ruby memory must remain high before a restart (seconds)
 # restart_delay = "5m"
-
+#
+# # Number of gitaly-ruby worker processes
+# num_workers = 2
+#
+# # Search path for system gitconfig file (e.g. /etc, /opt/gitlab/embedded/etc)
+# # NOTE: This only affects RPCs that use Rugged.
+# rugged_git_config_search_path = "/etc"
 
 [gitlab-shell]
 # The directory where gitlab-shell is installed
-dir = "/home/git/gitlab-shell"
+dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 
 # # You can adjust the concurrency of each RPC endpoint
 # [[concurrency]]
diff --git a/assets/runtime/functions b/assets/runtime/functions
index a9aed6ddd..17a192e0c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -236,7 +236,10 @@ gitlab_configure_gitaly() {
   echo "Configuring gitlab::gitaly..."
   update_template ${GITLAB_GITALY_CONFIG} \
     GITALY_SOCKET_PATH \
-    GITLAB_REPOS_DIR
+    GITLAB_GITALY_INSTALL_DIR \
+    GITLAB_LOG_DIR \
+    GITLAB_REPOS_DIR \
+    GITLAB_SHELL_INSTALL_DIR
 
   update_template ${GITLAB_CONFIG} \
     GITALY_CLIENT_PATH \
@@ -623,7 +626,7 @@ gitlab_configure_oauth2_generic() {
     OAUTH2_GENERIC_USER_NAME \
     OAUTH2_GENERIC_USER_EMAIL \
     OAUTH2_GENERIC_NAME
-  else 
+  else
       exec_as_git sed -i "/name: 'oauth2_generic'/,/{{OAUTH2_GENERIC_NAME}}/d" ${GITLAB_CONFIG}
   fi
 }

From df6a99a5e8c42d57ba030ea5e5c376ab798d2b5e Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Mon, 4 May 2020 10:37:46 +0530
Subject: [PATCH 0463/1124] update docs for release

---
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 722198123..700774904 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.4
+# sameersbn/gitlab:12.9.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -122,7 +122,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -191,7 +191,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -226,7 +226,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ## Database
@@ -259,7 +259,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -303,7 +303,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -330,7 +330,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ### Linking to Redis Container
@@ -357,7 +357,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 ### Mail
@@ -370,7 +370,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -390,7 +390,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -467,7 +467,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -483,7 +483,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.4
+ sameersbn/gitlab:12.9.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -506,7 +506,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -554,7 +554,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -735,14 +735,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.4
+    sameersbn/gitlab:12.9.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:sanitize
+    sameersbn/gitlab:12.9.5 app:sanitize
 ```
 
 ### Piwik
@@ -1123,7 +1123,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1158,14 +1158,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake db:setup
+    sameersbn/gitlab:12.9.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1174,7 +1174,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1224,7 +1224,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.9.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1237,7 +1237,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1268,7 +1268,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1290,12 +1290,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1321,7 +1321,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 4e460fe7f..1a5d5efa2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.4
\ No newline at end of file
+12.9.5
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8e2985419..5a00c45d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.4
+    image: sameersbn/gitlab:12.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 51de3dc6d..5feceaca5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.4
+docker pull sameersbn/gitlab:12.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.4
+sameersbn/gitlab:12.9.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fdad0344c..83c48beee 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.4
+        image: sameersbn/gitlab:12.9.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 1fd39dc09344e2d40a1f5b028a3ec8236d64b0c4 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Sun, 3 May 2020 19:46:04 +0530
Subject: [PATCH 0464/1124] update ci pipeline to circleci 2.1

---
 .circleci/config.yml     | 359 ++++++++++++++++++++++++++++++++++-----
 entrypoint.sh            |   1 +
 scripts/release-notes.sh |  48 ++++++
 3 files changed, 361 insertions(+), 47 deletions(-)
 create mode 100755 scripts/release-notes.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4d9332eff..2948543bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,66 +1,331 @@
-version: 2
-jobs:
-  shellcheck:
-    docker:
-      - image: nlknguyen/alpine-shellcheck:v0.4.6
+version: 2.1
+
+orbs:
+  shellcheck: circleci/shellcheck@1.3.16
+  docker: circleci/docker@1.0.1
+  go: circleci/go@1.1.1
+
+commands:
+  docker-build:
+    description: |
+      Build and optionally deploy a Docker images
+    parameters:
+      dockerfile:
+        default: Dockerfile
+        description: 'Name of dockerfile to use, defaults to Dockerfile'
+        type: string
+      extra_build_args:
+        default: ''
+        description: >
+          Extra flags to pass to docker build. For examples, see
+          https://docs.docker.com/engine/reference/commandline/build
+        type: string
+      registry:
+        default: docker.io
+        description: |
+          Comma separated list of registry to use, defaults to docker.io
+        type: string
+      image:
+        description: Name of image to build
+        type: string
+      tag:
+        default: $CIRCLE_SHA1
+        description: 'Image tag, defaults to the value of $CIRCLE_SHA1'
+        type: string
+      path:
+        default: .
+        description: >
+          Path to the directory containing your Dockerfile and build context,
+          defaults to . (working directory)
+        type: string
+      cache_from:
+        default: ''
+        description: >
+          Comma-separated list of images, images will first be pulled, then passed
+          as the --cache-from build argument
+          https://docs.docker.com/engine/reference/commandline/build/
+        type: string
+      no_output_timeout:
+        default: 10m
+        description: |
+          No output timeout for build step
+        type: string
+    steps:
+      - when:
+          condition: <<parameters.cache_from>>
+          steps:
+            - run:
+                name: Build image for <<parameters.registry>>
+                no_output_timeout: <<parameters.no_output_timeout>>
+                command: >
+                  echo "<<parameters.cache_from>>" | sed -n 1'p' | tr ',' '\n' |
+                  while read image; do
+                    echo "Pulling ${image}";
+                    docker pull ${image} || true
+                  done
+
+                  docker_tag_args=""
+
+                  IFS="," read -ra DOCKER_REGISTRIES \<<< "<< parameters.registry >>"
+
+                  for registry in "${DOCKER_REGISTRIES[@]}"; do
+                    IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
+
+                    for tag in "${DOCKER_TAGS[@]}"; do
+                      docker_tag_args="$docker_tag_args -t $registry/<<parameters.image>>:${tag}"
+                    done
+                  done
+
+                  docker build
+                  <<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
+                  \
+                    --cache-from <<parameters.cache_from>> \
+                    -f <<parameters.path>>/<<parameters.dockerfile>> \
+                    $docker_tag_args \
+                    <<parameters.path>>
+      - unless:
+          condition: <<parameters.cache_from>>
+          steps:
+            - run:
+                name: Building image for <<parameters.registry>>
+                no_output_timeout: <<parameters.no_output_timeout>>
+                command: >
+                  docker_tag_args=""
+
+                  IFS="," read -ra DOCKER_REGISTRIES \<<< "<< parameters.registry >>"
+
+                  for registry in "${DOCKER_REGISTRIES[@]}"; do
+                    IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
+
+                    for tag in "${DOCKER_TAGS[@]}"; do
+                      docker_tag_args="$docker_tag_args -t $registry/<<parameters.image>>:${tag}"
+                    done
+                  done
+
+                  docker build
+                  <<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
+                  \
+                    -f <<parameters.path>>/<<parameters.dockerfile>> \
+                    $docker_tag_args \
+                    <<parameters.path>>
+
+  docker-save:
+    description: |
+      Save one or more images to a tar archive
+    parameters:
+      registry:
+        default: docker.io
+        description: |
+          Comma separated list of registry to use, defaults to docker.io
+        type: string
+      image:
+        description: Name of image to build
+        type: string
+      tag:
+        default: $CIRCLE_SHA1
+        description: 'Image tag, defaults to the value of $CIRCLE_SHA1'
+        type: string
     steps:
-      - checkout
       - run:
-          name: Check Docker Hub Hooks
-          command: |
-            find hooks -type f | wc -l
-            find hooks -type f | xargs shellcheck -e SC2086 --external-sources
+          name: Save image to tar archive
+          command: >
+            docker_images=""
+
+            IFS="," read -ra DOCKER_REGISTRIES \<<< "<< parameters.registry >>"
+
+            for registry in "${DOCKER_REGISTRIES[@]}"; do
+              IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
+
+              for tag in "${DOCKER_TAGS[@]}"; do
+                docker_images="$docker_images $registry/<<parameters.image>>:${tag}"
+              done
+            done
+
+            mkdir -p ~/docker/
+
+            docker save -o ~/docker/docker-images.tar $docker_images
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - docker
+
+  docker-load:
+    description: |
+      Load tar archive
+    steps:
+      - attach_workspace:
+          at: ~/
       - run:
-          name: Check Scripts
-          command: |
-            find . -type f -name '*.sh' | wc -l
-            find . -type f -name '*.sh' | xargs shellcheck -e SC2086 -e SC1090 --external-sources
+          name: Load images from tar archive
+          command: >
+            docker load -i ~/docker/docker-images.tar
 
-  build:
-    docker:
-      - image: circleci/golang:1-stretch-browsers-legacy
-        environment:
-          IMAGE_NAME: "sameersbn/gitlab"
+  docker-publish:
+    description: |
+      Build and optionally deploy a Docker images
+    parameters:
+      pr:
+        default: ''
+        type: string
+      registry:
+        default: docker.io
+        description: |
+          Comma separated list of registry to use, defaults to docker.io
+        type: string
+      image:
+        description: Name of image to build
+        type: string
+      tag:
+        default: $CIRCLE_SHA1
+        description: 'Image tag, defaults to the value of $CIRCLE_SHA1'
+        type: string
+    steps:
+      - unless:
+          condition: <<parameters.pr>>
+          steps:
+            - run:
+                name: Publish image for <<parameters.registry>>
+                command: >
+                  IFS="," read -ra DOCKER_REGISTRIES \<<< "<< parameters.registry >>"
+
+                  for registry in "${DOCKER_REGISTRIES[@]}"; do
+                    IFS="," read -ra DOCKER_TAGS \<<< "<< parameters.tag >>"
 
+                    for tag in "${DOCKER_TAGS[@]}"; do
+                      docker push $registry/<< parameters.image>>:${tag}
+                    done
+                  done
+
+jobs:
+  build:
+    executor: docker/machine
     steps:
       - checkout
+      - docker-build:
+          registry: docker.io,quay.io
+          image: sameersbn/gitlab
+          tag: ${CIRCLE_TAG:-latest}
+          cache_from: docker.io/sameersbn/gitlab:latest
+          extra_build_args: '--build-arg GIT_COMMIT=${CIRCLE_SHA1} --build-arg GIT_TAG=$(date +%s)'
+          no_output_timeout: 45m
+      - docker-save:
+          registry: docker.io,quay.io
+          image: sameersbn/gitlab
+          tag: ${CIRCLE_TAG:-latest}
 
-      - setup_remote_docker:
-          version: 18.03.1-ce
-
+  test:
+    executor: docker/machine
+    steps:
+      - checkout
+      - docker-load
       - run:
-          name: Docker info
+          name: Update tag in docker-compose.yml
           command: |
-            docker version
-            docker info
-
+            sed -i "s|image: sameersbn/gitlab:.*|image: sameersbn/gitlab:${CIRCLE_TAG:-latest}|" docker-compose.yml
       - run:
-          name: Build docker image
-          command: |
-            docker build \
-              --pull \
-              --cache-from=${IMAGE_NAME} \
-              --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
-              --build-arg VCS_REF=$(git rev-parse --short HEAD) \
-              -t ${IMAGE_NAME}:$(cat VERSION) .
-          no_output_timeout: 60m
-
+          name: Launch gitlab stack
+          command: docker-compose up -d --quiet-pull
       - run:
-          name: Launching container for testing
-          command: |
-            docker-compose up -d
-            sleep 180
-
+          name: Container info
+          command: docker ps
+      - run:
+          name: Wait for stack bootup
+          command: sleep 90
       - run:
-          name: Testing image
+          name: Test image bootup
           command: |
             docker run --network container:$(docker-compose ps -q gitlab) \
-              appropriate/curl --ipv4 --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
+              curlimages/curl --ipv4 --retry 60 --retry-delay 5 --retry-connrefused -svf http://localhost/explore -o /dev/null
+
+  publish-dockerhub:
+    executor: docker/machine
+    steps:
+      - docker-load
+      - docker/check:
+          registry: docker.io
+          docker-username: DOCKER_LOGIN
+          docker-password: DOCKER_PASSWORD
+      - docker-publish:
+          registry: docker.io
+          image: sameersbn/gitlab
+          tag: ${CIRCLE_TAG:-latest}
+
+  publish-quay:
+    executor: docker/machine
+    steps:
+      - docker-load
+      - docker/check:
+          registry: quay.io
+          docker-username: DOCKER_LOGIN
+          docker-password: DOCKER_PASSWORD
+      - docker-publish:
+          registry: quay.io
+          image: sameersbn/gitlab
+          tag: ${CIRCLE_TAG:-latest}
 
+  release:
+    executor:
+      name: go/default
+      tag: '1.14'
+    steps:
+      - checkout
+      - run:
+          name: Installing github-release tool
+          command: go get github.com/meterup/github-release
+      - run:
+          name: Creating github release
+          command: |
+            PRE_RELEASE=${CIRCLE_TAG/${CIRCLE_TAG%-rc[0-9]*}/}
+            github-release delete -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -t ${CIRCLE_TAG} 2>/dev/null ||:
+            ./scripts/release-notes.sh ${CIRCLE_TAG} | github-release release ${PRE_RELEASE:+-p} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -t ${CIRCLE_TAG} -d -
+            for f in $(find /tmp/dist -type f); do github-release upload -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -t ${CIRCLE_TAG} -n $(basename ${f}) -f ${f} ; done
 
 workflows:
-  version: 2
-  build-and-test:
+  build-test-and-release:
     jobs:
-      - shellcheck
-      - build
+      - shellcheck/check:
+          name: shellcheck
+          ignore: SC2086,SC2181
+          filters:
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+      - build:
+          requires:
+            - shellcheck
+          filters:
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+      - test:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+      - publish-dockerhub:
+          context: dockerhub
+          requires:
+            - test
+          filters:
+            branches:
+              only: master
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+      - publish-quay:
+          context: quay
+          requires:
+            - test
+          filters:
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+            branches:
+              only: master
+      - release:
+          context: github
+          requires:
+            - publish-dockerhub
+            - publish-quay
+          filters:
+            tags:
+              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
+            branches:
+              ignore: /.*/
diff --git a/entrypoint.sh b/entrypoint.sh
index dee9f20e7..1d9bc107c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,6 +2,7 @@
 set -e
 set -o pipefail
 
+# shellcheck source=assets/runtime/functions
 source "${GITLAB_RUNTIME_DIR}/functions"
 
 [[ $DEBUG == true ]] && set -x
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
new file mode 100755
index 000000000..bd49f28e1
--- /dev/null
+++ b/scripts/release-notes.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env sh
+
+RELEASE=${GIT_TAG:-$1}
+
+if [ -z "${RELEASE}" ]; then
+  echo "Usage:"
+  echo "./scripts/release-notes.sh v0.1.0"
+  exit 1
+fi
+
+if ! git rev-list ${RELEASE} >/dev/null 2>&1; then
+  echo "${RELEASE} does not exist"
+  exit
+fi
+
+PREV_RELEASE=${PREV_RELEASE:-$(git describe --tags --abbrev=0 ${RELEASE}^)}
+PREV_RELEASE=${PREV_RELEASE:-$(git rev-list --max-parents=0 ${RELEASE}^)}
+NOTABLE_CHANGES=$(git cat-file -p ${RELEASE} | sed '/-----BEGIN PGP SIGNATURE-----/,//d' | tail -n +6)
+CHANGELOG=$(git log --no-merges --pretty=format:'- [%h] %s (%aN)' ${PREV_RELEASE}..${RELEASE})
+if [ $? -ne 0 ]; then
+  echo "Error creating changelog"
+  exit 1
+fi
+
+cat <<EOF
+${NOTABLE_CHANGES}
+
+## Docker Images for sameersbn/gitlab:${RELEASE}
+
+- [docker.io](https://hub.docker.com/r/sameersbn/gitlab/tags)
+- [quay.io](https://quay.io/repository/sameersbn/gitlab?tag=${RELEASE}&tab=tags)
+
+## Installation
+
+For installation and usage instructions please refer to the [README](https://github.com/sameersbn/docker-gitlab/blob/${RELEASE}/README.md)
+
+## Contributing
+
+If you find this image useful here's how you can help:
+
+- Send a Pull Request with your awesome new features and bug fixes
+- Be a part of the community and help resolve [issues](https://github.com/sameersbn/docker-gitlab/issues)
+- Support the development of this image with a [donation](http://www.damagehead.com/donate/)
+
+## Changelog
+
+${CHANGELOG}
+EOF

From 7fccf7f004c9d383847b4afb844668d94a6f2dc3 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 08:57:54 +0530
Subject: [PATCH 0465/1124] ci: specify correct build-args

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2948543bd..f3cead2d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -206,7 +206,7 @@ jobs:
           image: sameersbn/gitlab
           tag: ${CIRCLE_TAG:-latest}
           cache_from: docker.io/sameersbn/gitlab:latest
-          extra_build_args: '--build-arg GIT_COMMIT=${CIRCLE_SHA1} --build-arg GIT_TAG=$(date +%s)'
+          extra_build_args: '--build-arg VCS_REF=${CIRCLE_TAG:-${CIRCLE_SHA1}} --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"'
           no_output_timeout: 45m
       - docker-save:
           registry: docker.io,quay.io

From 4422e1c4a04d814cdff611a80d23ea62aa172429 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 10:05:01 +0530
Subject: [PATCH 0466/1124] remove "Fix for rebase in forks"

---
 assets/build/install.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 5acb8ffe2..4f94863d1 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -137,14 +137,6 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR}
 # remove go
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
-# Fix for rebase in forks 
-echo "Linking $(command -v gitaly-ssh) to /"
-ln -s "$(command -v gitaly-ssh)" /
-
-# Fix for gitaly-hooks
-echo "Linking $(command -v gitaly-hooks) to /"
-ln -s "$(command -v gitaly-hooks)" /
-
 # remove HSTS config from the default headers, we configure it in nginx
 exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb
 

From 8731a6844ee945814d2e38f3e26caef2a6e0c6e4 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 10:05:19 +0530
Subject: [PATCH 0467/1124] makefile: add buildargs to build commands

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 23f7daa36..a97663fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,14 @@ help:
 	@echo "   5. make purge        - stop and remove the container"
 
 build:
-	@docker build --tag=sameersbn/gitlab .
+	@docker build --tag=sameersbn/gitlab . \
+		--build-arg BUILD_DATE="$(shell date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg VCS_REF=$(shell git rev-parse --short HEAD)
 
 release: build
-	@docker build --tag=sameersbn/gitlab:$(shell cat VERSION) .
+	@docker build --tag=sameersbn/gitlab:$(shell cat VERSION) . \
+		--build-arg BUILD_DATE="$(shell date +"%Y-%m-%d %H:%M:%S%:z")" \
+		--build-arg VCS_REF=$(git describe --tags --always)
 
 quickstart:
 	@echo "Starting postgresql container..."

From 4e9b743377a622053cd108762501f8297ead342d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 10:11:58 +0530
Subject: [PATCH 0468/1124] integrations: add stalebot

---
 .github/stale.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..019cbf42e
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - keep-alive
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  any activity for the last 60 days. It will be closed if no further activity
+  occurs during the next 7 days. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

From f377eda47accfe23b2f4b2d9f1144e2c67d2ef28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Chr=C3=A9tien?= <achretien@manager.one>
Date: Wed, 6 May 2020 12:20:47 +0200
Subject: [PATCH 0469/1124] handle new gitaly logs correctly

---
 Dockerfile                               |  2 +-
 assets/build/install.sh                  | 13 +++++++++++++
 assets/runtime/config/gitaly/config.toml |  4 ++--
 assets/runtime/functions                 |  4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0f01dcf02..91c4ffc08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.25.2 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.10.0 \
+    GITALY_SERVER_VERSION=12.10.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 4f94863d1..8b7fbe024 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -266,6 +266,19 @@ ${GITLAB_LOG_DIR}/gitlab-shell/*.log {
 }
 EOF
 
+# configure gitlab log rotation
+cat > /etc/logrotate.d/gitaly <<EOF
+${GITLAB_LOG_DIR}/gitaly/*.log {
+  weekly
+  missingok
+  rotate 52
+  compress
+  delaycompress
+  notifempty
+  copytruncate
+}
+EOF
+
 # configure gitlab vhost log rotation
 cat > /etc/logrotate.d/gitlab-nginx <<EOF
 ${GITLAB_LOG_DIR}/nginx/*.log {
diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index 6e18163ca..6aa63be7f 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -45,9 +45,9 @@ path = "{{GITLAB_REPOS_DIR}}"
 #
 
 # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
-# [logging]
+[logging]
 # # The directory where Gitaly stores extra log files
-dir = "{{GITLAB_LOG_DIR}}"
+dir = "{{GITLAB_LOG_DIR}}/gitaly"
 # format = "json"
 # # Optional: Set log level to only log entries with that severity or above
 # # One of, in order: debug, info, warn, errror, fatal, panic
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 9a4d29863..1a0335706 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1347,6 +1347,10 @@ initialize_logdir() {
   mkdir -p ${GITLAB_LOG_DIR}/gitlab-shell
   chmod -R 0755 ${GITLAB_LOG_DIR}/gitlab-shell
   chown -R ${GITLAB_USER}: ${GITLAB_LOG_DIR}/gitlab-shell
+
+  mkdir -p ${GITLAB_LOG_DIR}/gitaly
+  chmod -R 0755 ${GITLAB_LOG_DIR}/gitaly
+  chown -R ${GITLAB_USER}: ${GITLAB_LOG_DIR}/gitaly
 }
 
 initialize_datadir() {

From e07b6010f9c46898977845362d52e137b081c79f Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 19:40:17 +0800
Subject: [PATCH 0470/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6be92f7b7..4a5e6033e 100644
--- a/README.md
+++ b/README.md
@@ -795,6 +795,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. |
 | `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. |
 | `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. |
+| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. |
 | `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. |
 | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` |
 | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |

From ee50f6899060d69253dafb819ee8a566177b1bd4 Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 21:09:54 +0800
Subject: [PATCH 0471/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 assets/runtime/env-defaults | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index c4899f5ff..8e14bc0f3 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -495,6 +495,9 @@ GITALY_TOKEN=${GITALY_TOKEN:-}
 GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket
 GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH}
 
+## GitLab Shell
+GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_INSTALL_DIR/hooks"}
+
 ## MONITORING
 GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10}
 GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}

From 4b505aacf8f50664a4ca693d0b412912d5504c58 Mon Sep 17 00:00:00 2001
From: Thomas Lee <litao.git@gmail.com>
Date: Tue, 5 Mar 2019 22:02:24 +0800
Subject: [PATCH 0472/1124] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR

---
 assets/runtime/functions | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 1a0335706..83622a48f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1674,6 +1674,13 @@ configure_gitlab_shell() {
     REDIS_HOST \
     REDIS_PORT \
     REDIS_DB_NUMBER
+
+  # update custom_hooks_dir if set $GITLAB_SHELL_CUSTOM_HOOKS_DIR
+  if [[ -n ${GITLAB_SHELL_CUSTOM_HOOKS_DIR} ]]; then
+    exec_as_git sed -i \
+      "s|custom_hooks_dir:.*|custom_hooks_dir: $GITLAB_SHELL_CUSTOM_HOOKS_DIR|g" \
+      ${GITLAB_SHELL_CONFIG}
+  fi
 }
 
 

From 622e68e9bc670a6c70ad3afa1897d04938122bc4 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 21:51:27 +0530
Subject: [PATCH 0473/1124] updated to ubuntu:bionic-20200403

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

diff --git a/Dockerfile b/Dockerfile
index 91c4ffc08..9f796d5c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200219
+FROM ubuntu:bionic-20200403
 
 ARG VERSION=12.9.5
 

From 0ae5ca8bdc51e24851addfb30d87a5d5ac7c1195 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 21:52:01 +0530
Subject: [PATCH 0474/1124] gitlab-workhorse: update to 8.30.1

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

diff --git a/Dockerfile b/Dockerfile
index 9f796d5c8..496821b2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=12.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.25.2 \
+    GITLAB_WORKHORSE_VERSION=8.30.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
     GITALY_SERVER_VERSION=12.10.4 \
     GITLAB_USER="git" \

From 9ec381b3ef46bcca6b693330c6c97d8854521f3d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 21:58:31 +0530
Subject: [PATCH 0475/1124] sync: upstream configs

---
 assets/runtime/config/gitlab-shell/config.yml |  12 +-
 assets/runtime/config/gitlabhq/gitlab.yml     | 728 ++++++++++++++++--
 assets/runtime/functions                      |   1 +
 3 files changed, 676 insertions(+), 65 deletions(-)

diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml
index 2e8e3a2db..5719b9357 100644
--- a/assets/runtime/config/gitlab-shell/config.yml
+++ b/assets/runtime/config/gitlab-shell/config.yml
@@ -42,14 +42,14 @@ log_file: "{{GITLAB_LOG_DIR}}/gitlab-shell/gitlab-shell.log"
 # Log level. INFO by default
 log_level: INFO
 
+# Log format. 'text' by default
+# log_format: json
+
 # Audit usernames.
 # Set to true to see real usernames in the logs instead of key ids, which is easier to follow, but
 # incurs an extra API call on every gitlab-shell command.
 audit_usernames: false
 
-# Git trace log file.
-# If set, git commands receive GIT_TRACE* environment variables
-# See https://git-scm.com/book/es/v2/Git-Internals-Environment-Variables#Debugging for documentation
-# An absolute path starting with / – the trace output will be appended to that file.
-# It needs to exist so we can check permissions and avoid to throwing warnings to the users.
-git_trace_log_file:
+# Distributed Tracing. GitLab-Shell has distributed tracing instrumentation.
+# For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html
+# gitlab_tracing: opentracing://driver
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index e648be921..2721a24b7 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -7,7 +7,8 @@
 # * are being moved to ApplicationSetting model!                       #
 # If a setting requires an application restart say so in that screen.  #
 # If you change this file in a Merge Request, please also create       #
-# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests  #
+# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. #
+# For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md #
 ########################################################################
 #
 #
@@ -26,16 +27,17 @@ production: &base
   # 1. GitLab app settings
   # ==========================
 
-
-
   ## GitLab settings
   gitlab:
     ## Web server settings (note: host is the FQDN, do not include http://)
     host: {{GITLAB_HOST}}
     port: {{GITLAB_PORT}} # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
     https: {{GITLAB_HTTPS}} # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
+    # The maximum time unicorn/puma can spend on the request. This needs to be smaller than the worker timeout.
+    # Default is 95% of the worker timeout
+    max_request_duration_seconds: 57
 
-    # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
+    # Uncomment this line below if your ssh host is different from HTTP/HTTPS one
     # (you'd obviously need to replace ssh.host_example.com with your own host).
     # Otherwise, ssh host will be set to the `host:` value above
     ssh_host: {{GITLAB_SSH_HOST}}
@@ -48,11 +50,38 @@ production: &base
     #
     relative_url_root: {{GITLAB_RELATIVE_URL_ROOT}}
 
+    # Content Security Policy
+    # See https://guides.rubyonrails.org/security.html#content-security-policy
+    content_security_policy:
+      enabled: true
+      report_only: false
+      directives:
+        base_uri:
+        child_src:
+        connect_src: "'self' http://localhost:* ws://localhost:* wss://localhost:*"
+        default_src: "'self'"
+        font_src:
+        form_action:
+        frame_ancestors: "'self'"
+        frame_src: "'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"
+        img_src: "* data: blob:"
+        manifest_src:
+        media_src:
+        object_src: "'none'"
+        script_src: "'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"
+        style_src: "'self' 'unsafe-inline'"
+        worker_src: "'self' blob:"
+        report_uri:
+
     # Trusted Proxies
     # Customize if you have GitLab behind a reverse proxy which is running on a different machine.
     # Add the IP address for your reverse proxy to the list, otherwise users will appear signed in from that address.
     trusted_proxies:
       - {{GITLAB_TRUSTED_PROXIES}}
+      # Examples:
+      #- 192.168.1.0/24
+      #- 192.168.2.1
+      #- 2001:0db8::/32
 
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
     # user: git
@@ -86,7 +115,8 @@ production: &base
 
     default_projects_limit: {{GITLAB_PROJECTS_LIMIT}}
     default_can_create_group: {{GITLAB_CREATE_GROUP}}  # default: true
-    username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace
+    username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change their username/namespace
+    signup_enabled: {{GITLAB_SIGNUP_ENABLED}}
     ## Default theme ID
     ##   1 - Indigo
     ##   2 - Dark
@@ -98,18 +128,14 @@ production: &base
     ##   8 - Light Green
     ##   9 - Red
     ##   10 - Light Red
-    default_theme: {{GITLAB_DEFAULT_THEME}}
-
-
-    # Enable or disable user signups (first run only)
-    signup_enabled: {{GITLAB_SIGNUP_ENABLED}}
+    default_theme: {{GITLAB_DEFAULT_THEME}} # default: 1
 
     ## Automatic issue closing
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
     # This happens when the commit is pushed or merged into the default branch of a project.
     # When not specified the default issue_closing_pattern as specified below will be used.
     # Tip: you can test your closing pattern at http://rubular.com.
-    # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
+    # issue_closing_pattern: '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
 
     ## Default project features settings
     default_projects_features:
@@ -124,6 +150,12 @@ production: &base
     # Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
     webhook_timeout: {{GITLAB_WEBHOOK_TIMEOUT}}
 
+    ### GraphQL Settings
+    # Tells the rails application how long it has to complete a GraphQL request.
+    # We suggest this value to be higher than the database timeout value
+    # and lower than the worker timeout set in unicorn/puma. (default: 30)
+    # graphql_timeout: 30
+
     ## Repository downloads directory
     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
     # The default is 'shared/cache/archive/' relative to the root of the Rails app.
@@ -132,6 +164,9 @@ production: &base
     ## Impersonation settings
     impersonation_enabled: {{GITLAB_IMPERSONATION_ENABLED}}
 
+    ## Disable jQuery and CSS animations
+    # disable_animations: true
+
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
   # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
@@ -140,6 +175,7 @@ production: &base
 
     # The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
     # The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
+    # Please be aware that a placeholder is required for the Service Desk feature to work.
     address: "{{GITLAB_INCOMING_EMAIL_ADDRESS}}"
 
     # Email account username
@@ -163,6 +199,11 @@ production: &base
 
     # The IDLE command timeout.
     idle_timeout: {{IMAP_TIMEOUT}}
+    # The log file path for the structured log file.
+    # Since `mail_room` is run independently of Rails, an absolute path is preferred.
+    # The default is 'log/mail_room_json.log' relative to the root of the Rails app.
+    #
+    # log_path: log/mail_room_json.log
 
   ## Build Artifacts
   artifacts:
@@ -172,17 +213,17 @@ production: &base
     object_store:
       enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
-      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
       background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
-        provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}}
+        provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
         #start-artifacts-aws
         aws_access_key_id: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
-        endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
+        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
         path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
         #end-artifacts-aws
         #start-artifacts-gcs
@@ -191,6 +232,24 @@ production: &base
         google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
         #end-artifacts-gcs
 
+  ## Merge request external diff storage
+  external_diffs:
+    # If disabled (the default), the diffs are in-database. Otherwise, they can
+    # be stored on disk, or in object storage
+    enabled: false
+    # The location where external diffs are stored (default: shared/lfs-external-diffs).
+    # storage_path: shared/external-diffs
+    # object_store:
+    #   enabled: false
+    #   remote_directory: external-diffs
+    #   background_upload: false
+    #   proxy_download: false
+    #   connection:
+    #     provider: AWS
+    #     aws_access_key_id: AWS_ACCESS_KEY_ID
+    #     aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+    #     region: us-east-1
+
   ## Git LFS
   lfs:
     enabled: {{GITLAB_LFS_ENABLED}}
@@ -198,7 +257,7 @@ production: &base
     storage_path: {{GITLAB_LFS_OBJECTS_DIR}}
     object_store:
       enabled: {{GITLAB_LFS_OBJECT_STORE_ENABLED}}
-      remote_directory: {{GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
+      remote_directory: {{GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY}} # Bucket name
       direct_upload: {{GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
       background_upload: {{GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
@@ -218,7 +277,12 @@ production: &base
         google_json_key_location: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
         #end-lfs-gcs
 
-        
+        # Use the following options to configure an AWS compatible host
+        # host: 'localhost' # default: s3.amazonaws.com
+        # endpoint: 'http://127.0.0.1:9000' # default: nil
+        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+
   ## Uploads (attachments, avatars, etc...)
   uploads:
     # The location where uploads objects are stored (default: public/).
@@ -226,7 +290,7 @@ production: &base
     base_dir: {{GITLAB_UPLOADS_BASE_DIR}}
     object_store:
       enabled: {{GITLAB_UPLOADS_OBJECT_STORE_ENABLED}}
-      remote_directory: {{GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
+      remote_directory: {{GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY}} # Bucket name
       direct_upload: {{GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
       background_upload: {{GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
@@ -235,6 +299,7 @@ production: &base
         #start-uploads-aws
         aws_access_key_id: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
+        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
         region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
@@ -246,23 +311,69 @@ production: &base
         google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
         #end-uploads-gcs
 
+  ## Packages (maven repository, npm registry, etc...)
+  packages:
+    enabled: true
+    # The location where build packages are stored (default: shared/packages).
+    # storage_path: shared/packages
+    object_store:
+      enabled: false
+      remote_directory: packages # The bucket name
+      # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
+      # background_upload: false # Temporary option to limit automatic upload (Default: true)
+      # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
+      connection:
+        provider: AWS
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+        # host: 'localhost' # default: s3.amazonaws.com
+        # endpoint: 'http://127.0.0.1:9000' # default: nil
+        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+
+  ## Dependency Proxy
+  dependency_proxy:
+    enabled: true
+    # The location where build packages are stored (default: shared/dependency_proxy).
+    # storage_path: shared/dependency_proxy
+    object_store:
+      enabled: false
+      remote_directory: dependency_proxy # The bucket name
+      # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
+      # background_upload: false # Temporary option to limit automatic upload (Default: true)
+      # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
+      connection:
+        provider: AWS
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+        # host: 'localhost' # default: s3.amazonaws.com
+        # endpoint: 'http://127.0.0.1:9000' # default: nil
+        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
 
   ## GitLab Pages
   pages:
     enabled: {{GITLAB_PAGES_ENABLED}}
+    access_control: {{GITLAB_PAGES_ACCESS_CONTROL}}
     # The location where pages are stored (default: shared/pages).
     # path: shared/pages
+
     # The domain under which the pages are served:
     # http://group.example.com/project
     # or project path can be a group page: group.example.com
     host: {{GITLAB_PAGES_DOMAIN}}
     port: {{GITLAB_PAGES_PORT}} # Set to 443 if you serve the pages with HTTPS
     https: {{GITLAB_PAGES_HTTPS}} # Set to true if you serve the pages with HTTPS
-    artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}}
-    access_control: {{GITLAB_PAGES_ACCESS_CONTROL}} # If true, allows access to a Pages site to be controlled based on a user’s membership to that project
+    artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} # Set to false if you want to disable online view of HTML artifacts
     external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages
     external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages
 
+    # File that contains the shared secret key for verifying access for gitlab-pages.
+    # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
+    # secret_file: /home/git/gitlab/.gitlab_pages_secret
+
   ## Mattermost
   ## For enabling Add to Mattermost button
   mattermost:
@@ -274,12 +385,11 @@ production: &base
   ## you'll need to provide the custom URLs. For more information,
   ## see: https://docs.gitlab.com/ee/customization/libravatar.html
   gravatar:
-    enabled: {{GITLAB_GRAVATAR_ENABLED}}                 # Use user avatar image from Gravatar.com (default: true)
-    # gravatar urls: possible placeholders: %{hash} %{size} %{email} %{username}
+    enabled: {{GITLAB_GRAVATAR_ENABLED}}
+    # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username}
     plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}"     # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
     ssl_url:   "{{GITLAB_GRAVATAR_HTTPS_URL}}"    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
 
-
   ## Sidekiq
   sidekiq:
     log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (default is the original format)
@@ -297,13 +407,23 @@ production: &base
     # Remove expired build artifacts
     expire_build_artifacts_worker:
       cron: "50 * * * *"
+    # Stop expired environments
+    environments_auto_stop_cron_worker:
+      cron: "24 * * * *"
     # Periodically run 'git fsck' on all repositories. If started more than
     # once per hour you will have concurrent 'git fsck' jobs.
     repository_check_worker:
       cron: "20 * * * *"
+    # Archive live traces which have not been archived yet
+    ci_archive_traces_cron_worker:
+      cron: "17 * * * *"
     # Send admin emails once a week
     admin_email_worker:
       cron: "0 0 * * 0"
+    # Send emails for personal tokens which are about to expire
+    personal_access_tokens_expiring_worker:
+      cron: "0 1 * * *"
+
     # Remove outdated repository archives
     repository_archive_cache_worker:
       cron: "0 * * * *"
@@ -312,6 +432,67 @@ production: &base
     pages_domain_verification_cron_worker:
       cron: "*/15 * * * *"
 
+    # Periodically migrate diffs from the database to external storage
+    schedule_migrate_external_diffs_worker:
+      cron: "15 * * * *"
+
+  # GitLab EE only jobs. These jobs are automatically enabled for an EE
+  # installation, and ignored for a CE installation.
+  ee_cron_jobs:
+    # Snapshot active users statistics
+    historical_data_worker:
+      cron: "0 12 * * *"
+
+    # In addition to refreshing users when they log in,
+    # periodically refresh LDAP users membership.
+    # NOTE: This will only take effect if LDAP is enabled
+    ldap_sync_worker:
+      cron: "30 1 * * *"
+
+    # Periodically refresh LDAP groups membership.
+    # NOTE: This will only take effect if LDAP is enabled
+    ldap_group_sync_worker:
+      cron: "0 * * * *"
+
+    # GitLab Geo metrics update worker
+    # NOTE: This will only take effect if Geo is enabled
+    geo_metrics_update_worker:
+      cron: "*/1 * * * *"
+
+    # GitLab Geo prune event log worker
+    # NOTE: This will only take effect if Geo is enabled (primary node only)
+    geo_prune_event_log_worker:
+      cron: "*/5 * * * *"
+
+    # GitLab Geo repository sync worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_repository_sync_worker:
+      cron: "*/1 * * * *"
+
+    # GitLab Geo registry backfill worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_secondary_registry_consistency_worker:
+      cron: "* * * * *"
+
+    # GitLab Geo file download dispatch worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_file_download_dispatch_worker:
+      cron: "*/1 * * * *"
+
+    # GitLab Geo migrated local files clean up worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    geo_migrated_local_files_clean_up_worker:
+      cron: "15 */6 * * *"
+
+    # Export pseudonymized data in CSV format for analysis
+    pseudonymizer_worker:
+      cron: "0 * * * *"
+
+    # Elasticsearch bulk updater for incremental updates.
+    # NOTE: This will only take effect if elasticsearch is enabled.
+    elastic_index_bulk_cron_worker:
+      cron: "*/1 * * * *"
+
   registry:
     enabled: {{GITLAB_REGISTRY_ENABLED}}
     host: {{GITLAB_REGISTRY_HOST}}
@@ -320,6 +501,17 @@ production: &base
     key: {{GITLAB_REGISTRY_KEY_PATH}}
     path: {{GITLAB_REGISTRY_DIR}}
     issuer: {{GITLAB_REGISTRY_ISSUER}}
+    # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry
+
+    # Add notification settings if you plan to use Geo Replication for the registry
+    # notifications:
+    # - name: geo_event
+    #   url: https://example.com/api/v4/container_registry_event/events
+    #   timeout: 2s
+    #   threshold: 5
+    #   backoff: 1s
+    #   headers:
+    #     Authorization: secret_phrase
 
   ## Error Reporting and Logging with Sentry
   sentry:
@@ -328,6 +520,28 @@ production: &base
     clientside_dsn: {{SENTRY_CLIENTSIDE_DSN}}
     environment: '{{SENTRY_ENVIRONMENT}}' # e.g. development, staging, production
 
+  ## Geo
+  # NOTE: These settings will only take effect if Geo is enabled
+  geo:
+    # This is an optional identifier which Geo nodes can use to identify themselves.
+    # For example, if external_url is the same for two secondaries, you must specify
+    # a unique Geo node name for those secondaries.
+    #
+    # If it is blank, it defaults to external_url.
+    node_name: ''
+
+    registry_replication:
+      # enabled: true
+      # primary_api_url: http://localhost:5000/ # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API
+
+  ## Feature Flag https://docs.gitlab.com/ee/user/project/operations/feature_flags.html
+  feature_flags:
+    unleash:
+      # enabled: false
+      # url: https://gitlab.com/api/v4/feature_flags/unleash/<project_id>
+      # app_name: gitlab.com # Environment name of your GitLab instance
+      # instance_id: INSTANCE_ID
+
   #
   # 2. GitLab CI settings
   # ==========================
@@ -349,10 +563,25 @@ production: &base
   # ==========================
 
   ## LDAP settings
-  # You can inspect a sample of the LDAP users with login access by running:
+  # You can test connections and inspect a sample of the LDAP users with login
+  # access by running:
   #   bundle exec rake gitlab:ldap:check RAILS_ENV=production
   ldap:
     enabled: {{LDAP_ENABLED}}
+    prevent_ldap_sign_in: false
+
+    # This setting controls the number of seconds between LDAP permission checks
+    # for each user. After this time has expired for a given user, their next
+    # interaction with GitLab (a click in the web UI, a git pull, etc.) will be
+    # slower because the LDAP permission check is being performed. How much
+    # slower depends on your LDAP setup, but it is not uncommon for this check
+    # to add seconds of waiting time. The default value is to have a "slow
+    # click" once every 3600 seconds (i.e., once per hour).
+    #
+    # Warning: if you set this value too low, every click in GitLab will be a
+    # "slow click" for all of your LDAP users.
+    # sync_time: 3600
+
     servers:
       ##########################################################################
       #
@@ -372,23 +601,88 @@ production: &base
         # Example: 'Paris' or 'Acme, Ltd.'
         label: '{{LDAP_LABEL}}'
 
+        # Example: 'ldap.mydomain.com'
         host: '{{LDAP_HOST}}'
-        port: {{LDAP_PORT}}
-        uid: '{{LDAP_UID}}'
-
-        encryption: '{{LDAP_METHOD}}' # "start_tls" or "simple_tls" or "plain"
-        verify_certificates: {{LDAP_VERIFY_SSL}}
-        ca_file: '{{LDAP_CA_FILE}}'
-        ssl_version: '{{LDAP_SSL_VERSION}}'
+        # This port is an example, it is sometimes different but it is always an integer and not a string
+        port: {{LDAP_PORT}} # usually 636 for SSL
+        uid: '{{LDAP_UID}}' # This should be the attribute, not the value that maps to uid.
 
+        # Examples: 'america\\momo' or 'CN=Gitlab Git,CN=Users,DC=mydomain,DC=com'
         bind_dn: '{{LDAP_BIND_DN}}'
         password: '{{LDAP_PASS}}'
 
+        # Encryption method. The "method" key is deprecated in favor of
+        # "encryption".
+        #
+        #   Examples: "start_tls" or "simple_tls" or "plain"
+        #
+        #   Deprecated values: "tls" was replaced with "start_tls" and "ssl" was
+        #   replaced with "simple_tls".
+        #
+        encryption: '{{LDAP_METHOD}}'
+
+        # Enables SSL certificate verification if encryption method is
+        # "start_tls" or "simple_tls". Defaults to true.
+        verify_certificates: {{LDAP_VERIFY_SSL}}
+
+        # OpenSSL::SSL::SSLContext options.
+        tls_options:
+          # Specifies the path to a file containing a PEM-format CA certificate,
+          # e.g. if you need to use an internal CA.
+          #
+          #   Example: '/etc/ca.pem'
+          #
+          ca_file: '{{LDAP_CA_FILE}}'
+
+          # Specifies the SSL version for OpenSSL to use, if the OpenSSL default
+          # is not appropriate.
+          #
+          #   Example: 'TLSv1_1'
+          #
+          ssl_version: '{{LDAP_SSL_VERSION}}'
+
+          # Specific SSL ciphers to use in communication with LDAP servers.
+          #
+          # Example: 'ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2'
+          ciphers: ''
+
+          # Client certificate
+          #
+          # Example:
+          #   cert: |
+          #     -----BEGIN CERTIFICATE-----
+          #     MIIDbDCCAlSgAwIBAgIGAWkJxLmKMA0GCSqGSIb3DQEBCwUAMHcxFDASBgNVBAoTC0dvb2dsZSBJ
+          #     bmMuMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQDEwtMREFQIENsaWVudDEPMA0GA1UE
+          #     CxMGR1N1aXRlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTAeFw0xOTAyMjAwNzE4
+          #     rntnF4d+0dd7zP3jrWkbdtoqjLDT/5D7NYRmVCD5vizV98FJ5//PIHbD1gL3a9b2MPAc6k7NV8tl
+          #     ...
+          #     4SbuJPAiJxC1LQ0t39dR6oMCAMab3hXQqhL56LrR6cRBp6Mtlphv7alu9xb/x51y2x+g2zWtsf80
+          #     Jrv/vKMsIh/sAyuogb7hqMtp55ecnKxceg==
+          #     -----END CERTIFICATE -----
+          cert: ''
+
+          # Client private key
+          #   key: |
+          #     -----BEGIN PRIVATE KEY-----
+          #     MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3DmJtLRmJGY4xU1QtI3yjvxO6
+          #     bNuyE4z1NF6Xn7VSbcAaQtavWQ6GZi5uukMo+W5DHVtEkgDwh92ySZMuJdJogFbNvJvHAayheCdN
+          #     7mCQ2UUT9jGXIbmksUn9QMeJVXTZjgJWJzPXToeUdinx9G7+lpVa62UATEd1gaI3oyL72WmpDy/C
+          #     rntnF4d+0dd7zP3jrWkbdtoqjLDT/5D7NYRmVCD5vizV98FJ5//PIHbD1gL3a9b2MPAc6k7NV8tl
+          #     ...
+          #     +9IhSYX+XIg7BZOVDeYqlPfxRvQh8vy3qjt/KUihmEPioAjLaGiihs1Fk5ctLk9A2hIUyP+sEQv9
+          #     l6RG+a/mW+0rCWn8JAd464Ps9hE=
+          #     -----END PRIVATE KEY-----
+          key: ''
+
         # Set a timeout, in seconds, for LDAP queries. This helps avoid blocking
         # a request if the LDAP server becomes unresponsive.
         # A value of 0 means there is no timeout.
         timeout: {{LDAP_TIMEOUT}}
 
+        # Enable smartcard authentication against the LDAP server. Valid values
+        # are "false", "optional", and "required".
+        smartcard_auth: false
+
         # This setting specifies if LDAP server is Active Directory LDAP server.
         # For non AD servers it skips the AD specific queries.
         # If your LDAP server is not AD, set this to false.
@@ -412,19 +706,47 @@ production: &base
 
         # Base where we can search for users
         #
-        #   Ex. ou=People,dc=gitlab,dc=example
+        #   Ex. 'ou=People,dc=gitlab,dc=example' or 'DC=mydomain,DC=com'
         #
         base: '{{LDAP_BASE}}'
 
         # Filter LDAP users
         #
-        #   Format: RFC 4515 http://tools.ietf.org/search/rfc4515
+        #   Format: RFC 4515 https://tools.ietf.org/search/rfc4515
         #   Ex. (employeeType=developer)
         #
         #   Note: GitLab does not support omniauth-ldap's custom filter syntax.
         #
+        #   Example for getting only specific users:
+        #   '(&(objectclass=user)(|(samaccountname=momo)(samaccountname=toto)))'
+        #
         user_filter: '{{LDAP_USER_FILTER}}'
 
+        # Base where we can search for groups
+        #
+        #   Ex. ou=Groups,dc=gitlab,dc=example
+        #
+        group_base: ''
+
+        # LDAP group of users who should be admins in GitLab
+        #
+        #   Ex. GLAdmins
+        #
+        admin_group: ''
+
+        # LDAP group of users who should be marked as external users in GitLab
+        #
+        #   Ex. ['Contractors', 'Interns']
+        #
+        external_groups: []
+
+        # Name of attribute which holds a ssh public key of the user object.
+        # If false or nil, SSH key syncronisation will be disabled.
+        #
+        #   Ex. sshpublickey
+        #
+        sync_ssh_keys: false
+
         # LDAP attributes that GitLab will use to create an account for the LDAP user.
         # The specified attribute can either be the attribute name as a string (e.g. 'mail'),
         # or an array of attribute names to try in order (e.g. ['mail', 'email']).
@@ -436,17 +758,17 @@ production: &base
           # If the attribute specified for `username` contains an email address,
           # the GitLab username will be the part of the email address before the '@'.
           username: {{LDAP_USER_ATTRIBUTE_USERNAME}}
-          email: {{LDAP_USER_ATTRIBUTE_MAIL}}
+          email:    {{LDAP_USER_ATTRIBUTE_MAIL}}
 
           # If no full name could be found at the attribute specified for `name`,
           # the full name is determined using the attributes specified for
           # `first_name` and `last_name`.
-          name: '{{LDAP_USER_ATTRIBUTE_NAME}}'
+          name:       '{{LDAP_USER_ATTRIBUTE_NAME}}'
           first_name: '{{LDAP_USER_ATTRIBUTE_FIRSTNAME}}'
-          last_name: '{{LDAP_USER_ATTRIBUTE_LASTNAME}}'
+          last_name:  '{{LDAP_USER_ATTRIBUTE_LASTNAME}}'
 
-          # If lowercase_usernames is enabled, GitLab will lower case the username.
-          lowercase_usernames: {{LDAP_LOWERCASE_USERNAMES}}
+        # If lowercase_usernames is enabled, GitLab will lower case the username.
+        lowercase_usernames: {{LDAP_LOWERCASE_USERNAMES}}
 
       # GitLab EE only: add more LDAP servers
       # Choose an ID made of a-z and 0-9 . This ID will be stored in the database
@@ -456,6 +778,47 @@ production: &base
       #   host:
       #   ....
 
+  ## Smartcard authentication settings
+  smartcard:
+    # Allow smartcard authentication
+    enabled: false
+
+    # Path to a file containing a CA certificate
+    ca_file: '/etc/ssl/certs/CA.pem'
+
+    # Host and port where the client side certificate is requested by the
+    # webserver (NGINX/Apache)
+    # client_certificate_required_host: smartcard.gitlab.example.com
+    # client_certificate_required_port: 3444
+
+    # Browser session with smartcard sign-in is required for Git access
+    # required_for_git_access: false
+
+    # Use X.509 SAN extensions certificates to identify GitLab users
+    # Add a subjectAltName to your certificates like: email:user
+    # san_extensions: true
+
+  ## Kerberos settings
+  kerberos:
+    # Allow the HTTP Negotiate authentication method for Git clients
+    enabled: false
+
+    # Kerberos 5 keytab file. The keytab file must be readable by the GitLab user,
+    # and should be different from other keytabs in the system.
+    # (default: use default keytab from Krb5 config)
+    # keytab: /etc/http.keytab
+
+    # The Kerberos service name to be used by GitLab.
+    # (default: accept any service name in keytab file)
+    # service_principal_name: HTTP/gitlab.example.com@EXAMPLE.COM
+
+    # Dedicated port: Git before 2.4 does not fall back to Basic authentication if Negotiate fails.
+    # To support both Basic and Negotiate methods with older versions of Git, configure
+    # nginx to proxy GitLab on an extra port (e.g. 8443) and uncomment the following lines
+    # to dedicate this port to Kerberos authentication. (default: false)
+    # use_dedicated_port: true
+    # port: 8443
+    # https: true
 
   ## OmniAuth settings
   omniauth:
@@ -466,15 +829,23 @@ production: &base
     # showing GitLab's sign-in page (default: show the GitLab sign-in page)
     auto_sign_in_with_provider: {{OAUTH_AUTO_SIGN_IN_WITH_PROVIDER}}
 
-    # Sync user's email address from the specified Omniauth provider every time the user logs
-    # in (default: nil). And consequently make this field read-only.
-    # sync_email_from_provider: cas3
+    # Sync user's profile from the specified Omniauth providers every time the user logs in (default: empty).
+    # Define the allowed providers using an array, e.g. ["cas3", "saml", "twitter"],
+    # or as true/false to allow all providers or none.
+    # When authenticating using LDAP, the user's email is always synced.
+    # sync_profile_from_provider: []
+
+    # Select which info to sync from the providers above. (default: email).
+    # Define the synced profile info using an array. Available options are "name", "email" and "location"
+    # e.g. ["name", "email", "location"] or as true to sync all available.
+    # This consequently will make the selected attributes read-only.
+    # sync_profile_attributes: true
 
     # CAUTION!
     # This allows users to login without having a user account first. Define the allowed providers
     # using an array, e.g. ["saml", "twitter"], or as true/false to allow all providers or none.
     # User accounts will be created automatically when authentication was successful.
-    allow_single_sign_on: [{{OAUTH_ALLOW_SSO}}]
+    allow_single_sign_on: ["{{OAUTH_ALLOW_SSO}}"]
 
     # Locks down those users until they have been cleared by the admin (default: true).
     block_auto_created_users: {{OAUTH_BLOCK_AUTO_CREATED_USERS}}
@@ -494,6 +865,14 @@ production: &base
     # (default: [])
     external_providers: [{{OAUTH_EXTERNAL_PROVIDERS}}]
 
+    # CAUTION!
+    # This allows users to login with the specified providers without two factor. Define the allowed providers
+    # using an array, e.g. ["twitter", 'google_oauth2'], or as true/false to allow all providers or none.
+    # This option should only be configured for providers which already have two factor.
+    # This configration dose not apply to SAML.
+    # (default: false)
+    allow_bypass_two_factor: null
+
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
     # If your favorite auth provider is not listed you can use others:
@@ -603,13 +982,13 @@ production: &base
 
   # Shared file storage settings
   shared:
-    path: {{GITLAB_SHARED_DIR}}
+    path: {{GITLAB_SHARED_DIR}} # Default: shared
 
   # Gitaly settings
   gitaly:
     # Path to the directory containing Gitaly client executables.
     client_path: {{GITALY_CLIENT_PATH}}
-    # Default Gitaly authentication token. Can be overriden per storage. Can
+    # Default Gitaly authentication token. Can be overridden per storage. Can
     # be left blank when Gitaly is running locally on a Unix socket, which
     # is the normal way to deploy Gitaly.
     token: {{GITALY_TOKEN}}
@@ -627,7 +1006,8 @@ production: &base
     storages: # You must have at least a `default` storage path.
       default:
         path: {{GITLAB_REPOS_DIR}}/
-        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
+        gitaly_address: unix:{{GITLAB_INSTALL_DIR}}/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
+        # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
 
   ## Backup settings
   backup:
@@ -669,10 +1049,37 @@ production: &base
       remote_directory: '{{GCS_BACKUP_BUCKET}}'
       #end-gcs
 
+      remote_directory: 'my.s3.bucket'
+      # Use multipart uploads when file size reaches 100MB, see
+      #  http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html
+      multipart_chunk_size: 104857600
+      # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
+      # encryption: 'AES256'
+      # Turns on AWS Server-Side Encryption with Amazon Customer-Provided Encryption Keys for backups, this is optional
+      #   This should be set to the 256-bit encryption key for Amazon S3 to use to encrypt or decrypt your data.
+      #   'encryption' must also be set in order for this to have any effect.
+      # encryption_key: '<key>'
+      # Specifies Amazon S3 storage class to use for backups, this is optional
+      # storage_class: 'STANDARD'
+
+  ## Pseudonymizer exporter
+  pseudonymizer:
+    # Tables manifest that specifies the fields to extract and pseudonymize.
+    manifest: config/pseudonymizer.yml
+    upload:
+      remote_directory: 'gitlab-elt'
+      # Fog storage connection settings, see http://fog.io/storage/ .
+      connection:
+      #   provider: AWS
+      #   region: eu-west-1
+      #   aws_access_key_id: AKIAKIAKI
+      #   aws_secret_access_key: 'secret123'
+      #   # The remote 'directory' to store the CSV files. For S3, this would be the bucket name.
+
   ## GitLab Shell settings
   gitlab_shell:
     path: {{GITLAB_SHELL_INSTALL_DIR}}/
-    hooks_path: {{GITLAB_SHELL_INSTALL_DIR}}/hooks/
+    authorized_keys_file: {{GITLAB_HOME}}/.ssh/authorized_keys
 
     # File that contains the secret key for verifying access for gitlab-shell.
     # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -688,6 +1095,15 @@ production: &base
     # If you use non-standard ssh port you need to specify it
     ssh_port: {{GITLAB_SSH_PORT}}
 
+  workhorse:
+    # File that contains the secret key for verifying access for gitlab-workhorse.
+    # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
+    # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
+
+  ## GitLab Elasticsearch settings
+  elasticsearch:
+    indexer_path: {{GITLAB_HOME}}/gitlab-elasticsearch-indexer/
+
   ## Git settings
   # CAUTION!
   # Use the default values unless you really know what you are doing
@@ -697,25 +1113,54 @@ production: &base
   ## Webpack settings
   # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
   # on a given port instead of serving directly from /assets/webpack. This is only indended for use
-  # in development.<Paste>
+  # in development.
   webpack:
     # dev_server:
     #   enabled: true
     #   host: localhost
     #   port: 3808
-    ## Monitoring
+
+  ## Monitoring
   # Built in monitoring settings
   monitoring:
     # Time between sampling of unicorn socket metrics, in seconds
     unicorn_sampler_interval: {{GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL}}
+    # Time between sampling of Puma metrics, in seconds
+    # puma_sampler_interval: 5
     # IP whitelist to access monitoring endpoints
     ip_whitelist:
       - {{GITLAB_MONITORING_IP_WHITELIST}}
+
     # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics
     sidekiq_exporter:
-      enabled: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED}}
-      address: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS}}
-      port: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT}}
+     enabled: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED}}
+     address: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS}}
+     port: {{GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT}}
+
+    # Web exporter is webserver built in to Unicorn/Puma to expose Prometheus metrics
+    # It runs alongside the `/metrics` endpoints to ease the publish of metrics
+    web_exporter:
+    #  enabled: true
+    #  address: localhost
+    #  port: 8083
+
+  ## Prometheus settings
+  # Do not modify these settings here. They should be modified in /etc/gitlab/gitlab.rb
+  # if you installed GitLab via Omnibus.
+  # If you installed from source, you need to install and configure Prometheus
+  # yourself, and then update the values here.
+  # https://docs.gitlab.com/ee/administration/monitoring/prometheus/
+  prometheus:
+    # enable: true
+    # listen_address: 'localhost:9090'
+
+  shutdown:
+    #  # blackout_seconds:
+    #  #   defines an interval to block healthcheck,
+    #  #   but continue accepting application requests
+    #  #   this allows Load Balancer to notice service
+    #  #   being shutdown and not interrupt any of the clients
+    #  blackout_seconds: 10
 
   #
   # 5. Extra customization
@@ -735,7 +1180,7 @@ production: &base
       enabled: {{RACK_ATTACK_ENABLED}}
       #
       # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers
-      ip_whitelist: [{{RACK_ATTACK_WHITELIST}}]
+      ip_whitelist: ["{{RACK_ATTACK_WHITELIST}}"]
       #
       # Limit the number of Git HTTP authentication attempts per IP
       maxretry: {{RACK_ATTACK_MAXRETRY}}
@@ -749,34 +1194,135 @@ production: &base
 development:
   <<: *base
 
+  # We want to run web/sidekiq exporters for devs
+  # to catch errors from using them.
+  #
+  # We use random port to not block ability to run
+  # multiple instances of the service
+  monitoring:
+    sidekiq_exporter:
+      enabled: true
+      address: 127.0.0.1
+      port: 0
+    web_exporter:
+      enabled: true
+      address: 127.0.0.1
+      port: 0
+
 test:
   <<: *base
   gravatar:
     enabled: true
+  external_diffs:
+    enabled: false
+    # Diffs may be `always` external (the default), or they can be made external
+    # after they have become `outdated` (i.e., the MR is closed or a new version
+    # has been pushed).
+    # when: always
+    # The location where external diffs are stored (default: shared/external-diffs).
+    # storage_path: shared/external-diffs
+    object_store:
+      enabled: false
+      remote_directory: external-diffs # The bucket name
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
   lfs:
     enabled: false
+    # The location where LFS objects are stored (default: shared/lfs-objects).
+    # storage_path: shared/lfs-objects
+    object_store:
+      enabled: false
+      remote_directory: lfs-objects # The bucket name
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+  artifacts:
+    path: tmp/tests/artifacts
+    enabled: true
+    # The location where build artifacts are stored (default: shared/artifacts).
+    # path: shared/artifacts
+    object_store:
+      enabled: false
+      remote_directory: artifacts # The bucket name
+      background_upload: false
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+  uploads:
+    storage_path: tmp/tests/public
+    object_store:
+      enabled: false
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+
   gitlab:
     host: localhost
     port: 80
 
-    # When you run tests we clone and setup gitlab-shell
-    # In order to setup it correctly you need to specify
+    content_security_policy:
+      enabled: true
+      report_only: false
+      directives:
+        base_uri:
+        child_src:
+        connect_src:
+        default_src: "'self'"
+        font_src:
+        form_action:
+        frame_ancestors: "'self'"
+        frame_src: "'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"
+        img_src: "* data: blob:"
+        manifest_src:
+        media_src:
+        object_src: "'none'"
+        script_src: "'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"
+        style_src: "'self' 'unsafe-inline'"
+        worker_src: "'self' blob:"
+        report_uri:
+
+    # When you run tests we clone and set up gitlab-shell
+    # In order to set it up correctly you need to specify
     # your system username you use to run GitLab
     # user: YOUR_USERNAME
   pages:
     path: tmp/tests/pages
-  artifacts:
-    path: tmp/tests/artifacts
   repositories:
     storages:
       default:
         path: tmp/tests/repositories/
-        gitaly_adress: unix:tmp/tests/gitaly/gitaly.socket
+        gitaly_address: unix:tmp/tests/gitaly/gitaly.socket
+
+  gitaly:
+    client_path: tmp/tests/gitaly
+    token: secret
+  workhorse:
+    secret_file: tmp/gitlab_workhorse_test_secret
   backup:
     path: tmp/tests/backups
+  pseudonymizer:
+    manifest: config/pseudonymizer.yml
+    upload:
+      # The remote 'directory' to store the CSV files. For S3, this would be the bucket name.
+      remote_directory: gitlab-elt.test
+      # Fog storage connection settings, see http://fog.io/storage/
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
   gitlab_shell:
     path: tmp/tests/gitlab-shell/
-    hooks_path: tmp/tests/gitlab-shell/hooks/
+    authorized_keys_file: tmp/tests/authorized_keys
   issues_tracker:
     redmine:
       title: "Redmine"
@@ -784,9 +1330,70 @@ test:
       issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
       new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
     jira:
-      title: "JIRA"
-      url: https://sample_company.atlasian.net
+      title: "Jira"
+      url: https://sample_company.atlassian.net
       project_key: PROJECT
+
+  omniauth:
+    # enabled: true
+    allow_single_sign_on: true
+    external_providers: []
+
+    providers:
+      - { name: 'cas3',
+          label: 'cas3',
+          args: { url: 'https://sso.example.com',
+                  disable_ssl_verification: false,
+                  login_url: '/cas/login',
+                  service_validate_url: '/cas/p3/serviceValidate',
+                  logout_url: '/cas/logout'} }
+      - { name: 'github',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET',
+          url: "https://github.com/",
+          verify_ssl: false,
+          args: { scope: 'user:email' } }
+      - { name: 'bitbucket',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET' }
+      - { name: 'gitlab',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET',
+          args: { scope: 'api' } }
+      - { name: 'google_oauth2',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET',
+          args: { access_type: 'offline', approval_prompt: '' } }
+      - { name: 'facebook',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET' }
+      - { name: 'twitter',
+          app_id: 'YOUR_APP_ID',
+          app_secret: 'YOUR_APP_SECRET' }
+      - { name: 'jwt',
+          app_secret: 'YOUR_APP_SECRET',
+          args: {
+                  algorithm: 'HS256',
+                  uid_claim: 'email',
+                  required_claims: ["name", "email"],
+                  info_map: { name: "name", email: "email" },
+                  auth_url: 'https://example.com/',
+                  valid_within: null,
+                }
+        }
+      - { name: 'auth0',
+          args: {
+            client_id: 'YOUR_AUTH0_CLIENT_ID',
+            client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
+            namespace: 'YOUR_AUTH0_DOMAIN' } }
+      - { name: 'authentiq',
+          app_id: 'YOUR_CLIENT_ID',
+          app_secret: 'YOUR_CLIENT_SECRET',
+          args: { scope: 'aq:name email~rs address aq:push' } }
+      - { name: 'salesforce',
+          app_id: 'YOUR_CLIENT_ID',
+          app_secret: 'YOUR_CLIENT_SECRET'
+        }
   ldap:
     enabled: false
     servers:
@@ -800,6 +1407,9 @@ test:
         user_filter: ''
         group_base: 'ou=groups,dc=example,dc=com'
         admin_group: ''
+  prometheus:
+    enable: true
+    listen_address: 'localhost:9090'
 
 staging:
   <<: *base
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 1a0335706..8caa47208 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1233,6 +1233,7 @@ nginx_configure_gitlab_real_ip() {
 nginx_configure_gitlab() {
   echo "Configuring nginx::gitlab..."
   update_template ${GITLAB_NGINX_CONFIG} \
+    GITLAB_HOME \
     GITLAB_INSTALL_DIR \
     GITLAB_LOG_DIR \
     GITLAB_HOST \

From 25cb2e7466848139b159a31199227b7241ea4253 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 6 May 2020 21:59:29 +0530
Subject: [PATCH 0476/1124] gitlab: upgrade to 12.10.4

---
 Dockerfile                                |  2 +-
 README.md                                 | 52 +++++++++++------------
 VERSION                                   |  2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 30 +++++++++++++
 assets/runtime/config/gitlabhq/puma.rb    |  7 ---
 assets/runtime/functions                  |  8 +---
 docker-compose.yml                        |  2 +-
 docs/container_registry.md                | 10 ++---
 kubernetes/gitlab-rc.yml                  |  2 +-
 9 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 496821b2f..608370459 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=12.9.5
+ARG VERSION=12.10.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 6be92f7b7..0a2575845 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.9.5
+# sameersbn/gitlab:12.10.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -122,7 +122,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.5
+docker pull sameersbn/gitlab:12.10.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -191,7 +191,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -226,7 +226,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 ## Database
@@ -259,7 +259,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -303,7 +303,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -330,7 +330,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 ### Linking to Redis Container
@@ -357,7 +357,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 ### Mail
@@ -370,7 +370,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -390,7 +390,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -467,7 +467,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -483,7 +483,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.9.5
+ sameersbn/gitlab:12.10.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -506,7 +506,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -554,7 +554,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -735,14 +735,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.9.5
+    sameersbn/gitlab:12.10.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:sanitize
+    sameersbn/gitlab:12.10.4 app:sanitize
 ```
 
 ### Piwik
@@ -1124,7 +1124,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1159,14 +1159,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake db:setup
+    sameersbn/gitlab:12.10.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1175,7 +1175,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1225,7 +1225,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:env:info
+    sameersbn/gitlab:12.10.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1238,7 +1238,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.10.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1269,7 +1269,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.10.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1291,12 +1291,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.5
+docker pull sameersbn/gitlab:12.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1322,7 +1322,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.9.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.10.4
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 1a5d5efa2..78e64bc89 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.5
\ No newline at end of file
+12.10.4
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 2721a24b7..3fd1b4beb 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -353,6 +353,24 @@ production: &base
         # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
         # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
 
+  ## Terraform state
+  terraform_state:
+    enabled: true
+    # The location where Terraform state files are stored (default: shared/terraform_state).
+    # storage_path: shared/terraform_state
+    object_store:
+      enabled: false
+      remote_directory: terraform_state # The bucket name
+      connection:
+        provider: AWS
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+        # host: 'localhost' # default: s3.amazonaws.com
+        # endpoint: 'http://127.0.0.1:9000' # default: nil
+        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+
   ## GitLab Pages
   pages:
     enabled: {{GITLAB_PAGES_ENABLED}}
@@ -1265,6 +1283,18 @@ test:
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
         region: us-east-1
 
+  terraform_state:
+    enabled: true
+    storage_path: tmp/tests/terraform_state
+    object_store:
+      enabled: false
+      remote_directory: terraform_state
+      connection:
+        provider: AWS # Only AWS supported at the moment
+        aws_access_key_id: AWS_ACCESS_KEY_ID
+        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        region: us-east-1
+
   gitlab:
     host: localhost
     port: 80
diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
index b520e3fc9..f48ff788a 100644
--- a/assets/runtime/config/gitlabhq/puma.rb
+++ b/assets/runtime/config/gitlabhq/puma.rb
@@ -1,10 +1,3 @@
-
-# Relative URL support
-# WARNING: We recommend using an FQDN to host GitLab in a root path instead
-# of using a relative URL.
-# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
-# Uncomment and customize the following line to run in a non-root path
-#
 ENV['RAILS_RELATIVE_URL_ROOT'] = "{{GITLAB_RELATIVE_URL_ROOT}}"
 
 # frozen_string_literal: true
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8caa47208..c74a1032f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -274,19 +274,13 @@ gitlab_configure_puma() {
   fi
 
   update_template ${GITLAB_PUMA_CONFIG} \
-    GITLAB_INSTALL_DIR \
-    GITLAB_INSTALL_DIR \
-    GITLAB_INSTALL_DIR \
     GITLAB_INSTALL_DIR \
     PUMA_THREADS_MIN \
     PUMA_THREADS_MAX \
     PUMA_WORKERS \
     PUMA_PER_WORKER_MAX_MEMORY_MB \
     PUMA_MASTER_MAX_MEMORY_MB \
-    GITLAB_INSTALL_DIR \
-    GITLAB_INSTALL_DIR \
-    PUMA_TIMEOUT \
-    GITLAB_INSTALL_DIR
+    PUMA_TIMEOUT
 }
 
 gitlab_configure_relative_url() {
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a00c45d0..b48bf3200 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.9.5
+    image: sameersbn/gitlab:12.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5feceaca5..5889114d3 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.9.5
+docker pull sameersbn/gitlab:12.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.9.5
+sameersbn/gitlab:12.10.4
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 83c48beee..a292ae23f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.9.5
+        image: sameersbn/gitlab:12.10.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 6658f5c11ce35476b5b7ddd009dfadacd05b50b6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 16 May 2020 08:16:53 +0200
Subject: [PATCH 0477/1124] docs: update changelog for latest release

---
 Changelog.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 2c9b5b1da..966faa52e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,18 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+
+**12.10.4**
+- updated to ubuntu:bionic-20200403
+- gitlab-workhorse: update to 8.30.1
+- sync: upstream configs
+- gitlab: upgrade to 12.10.4
+
+**12.9.5**
+- gitlab: updated to 12.9.5
+- gitlab-shell: updated to 12.2.0
+- gitaly: updated to 12.10.0
+
 **12.9.4**
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2

From 07954a38a655bfc992af826dc9b03535198c1669 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 16 May 2020 08:10:25 +0200
Subject: [PATCH 0478/1124] Upgrade GitLab CE to 12.10.6

---
 Changelog.md               |  4 ++-
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 966faa52e..d00c9a0f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,8 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**12.10.6**
+- gitlab: upgrade CE to v12.10.6
 
 **12.10.4**
 - updated to ubuntu:bionic-20200403
@@ -19,7 +21,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
-
+- 
 **12.9.2**
 - gitlab: upgrade CE to v12.9.2
 
diff --git a/Dockerfile b/Dockerfile
index 608370459..16f87ddf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=12.10.4
+ARG VERSION=12.10.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.30.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.10.4 \
+    GITALY_SERVER_VERSION=12.10.6 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0a2575845..1a497cb28 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.10.4
+# sameersbn/gitlab:12.10.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -122,7 +122,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.4
+docker pull sameersbn/gitlab:12.10.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -191,7 +191,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -226,7 +226,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 ## Database
@@ -259,7 +259,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -303,7 +303,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -330,7 +330,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 ### Linking to Redis Container
@@ -357,7 +357,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 ### Mail
@@ -370,7 +370,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -390,7 +390,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -467,7 +467,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -483,7 +483,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.10.4
+ sameersbn/gitlab:12.10.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -506,7 +506,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -554,7 +554,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -735,14 +735,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.10.4
+    sameersbn/gitlab:12.10.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:sanitize
+    sameersbn/gitlab:12.10.6 app:sanitize
 ```
 
 ### Piwik
@@ -1124,7 +1124,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1159,14 +1159,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake db:setup
+    sameersbn/gitlab:12.10.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1175,7 +1175,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1225,7 +1225,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.10.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1238,7 +1238,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.10.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1269,7 +1269,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.10.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1291,12 +1291,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:12.10.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.4
+docker pull sameersbn/gitlab:12.10.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1322,7 +1322,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.10.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.10.6
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 78e64bc89..a3d2194c1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.10.4
+12.10.6
diff --git a/docker-compose.yml b/docker-compose.yml
index b48bf3200..9ee866602 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.10.4
+    image: sameersbn/gitlab:12.10.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5889114d3..7125c76a0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.4
+docker pull sameersbn/gitlab:12.10.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.10.4
+sameersbn/gitlab:12.10.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a292ae23f..bd383bb3a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.10.4
+        image: sameersbn/gitlab:12.10.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 4b4cbb8f98027b16cc8e65911eb3446360de5679 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 17 May 2020 12:51:30 +0200
Subject: [PATCH 0479/1124] fix: add GITLAB_HOME env for gitlab.yml
 substitution

This adds a missing environment variable that was required in
https://github.com/sameersbn/docker-gitlab/blob/master/assets/runtime/config/gitlabhq/gitlab.yml#L1100

Closes #2145
---
 assets/runtime/functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index c74a1032f..3de499b98 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1610,6 +1610,7 @@ configure_gitlab() {
     GITLAB_REPOS_DIR \
     GITLAB_DOWNLOADS_DIR \
     GITLAB_SHARED_DIR \
+    GITLAB_HOME \
     GITLAB_HOST \
     GITLAB_PORT \
     GITLAB_RELATIVE_URL_ROOT \

From b80e2673fe36c3ec9b27246afd9dea658af37580 Mon Sep 17 00:00:00 2001
From: Tien Tran <tiendung.tran@gmail.com>
Date: Thu, 21 May 2020 10:21:39 +1000
Subject: [PATCH 0480/1124] Fix accidental replacement if no backup is
 configured

If none of AWS or GCS backups are configured, sed command would accidentially replace the second "upload:" occurrence until the end of file.
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 3de499b98..2390fe83c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -868,7 +868,7 @@ gitlab_configure_backups() {
     GITLAB_BACKUP_ARCHIVE_PERMISSIONS
   gitlab_configure_backups_schedule
   if [[ ${AWS_BACKUPS} != true && ${GCS_BACKUPS} != true ]]; then
-    exec_as_git sed -i "/\s\+upload:/,/#end-gcs/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/\s\+#start-aws/,/#end-gcs/d" ${GITLAB_CONFIG}
     return 0
   fi
   if [[ ${AWS_BACKUPS} == true && ${GCS_BACKUPS} == true ]]; then

From 45d638a884a261166c2c181dd7ecec4e717ead1e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Thu, 21 May 2020 11:20:06 +0200
Subject: [PATCH 0481/1124] fix: duplicate remote directory key and aws
 encryption settings

---
 assets/runtime/config/gitlabhq/gitlab.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 3fd1b4beb..1f63a891c 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1054,12 +1054,16 @@ production: &base
       #start-encryption-aws
       # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
       encryption: 'AES256'
+      # Turns on AWS Server-Side Encryption with Amazon Customer-Provided Encryption Keys for backups, this is optional
+      #   This should be set to the 256-bit encryption key for Amazon S3 to use to encrypt or decrypt your data.
+      #   'encryption' must also be set in order for this to have any effect.
+      # encryption_key: '<key>'
       #end-encryption-aws
       # Specifies Amazon S3 storage class to use for backups, this is optional
       storage_class: '{{AWS_BACKUP_STORAGE_CLASS}}'
-      # Fog storage connection settings, see http://fog.io/storage/ .
       #end-aws
       #start-gcs
+      # Fog storage connection settings, see http://fog.io/storage/ .
       connection:
         provider: Google
         google_storage_access_key_id: {{GCS_BACKUP_ACCESS_KEY_ID}}
@@ -1067,19 +1071,6 @@ production: &base
       remote_directory: '{{GCS_BACKUP_BUCKET}}'
       #end-gcs
 
-      remote_directory: 'my.s3.bucket'
-      # Use multipart uploads when file size reaches 100MB, see
-      #  http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html
-      multipart_chunk_size: 104857600
-      # Turns on AWS Server-Side Encryption with Amazon S3-Managed Keys for backups, this is optional
-      # encryption: 'AES256'
-      # Turns on AWS Server-Side Encryption with Amazon Customer-Provided Encryption Keys for backups, this is optional
-      #   This should be set to the 256-bit encryption key for Amazon S3 to use to encrypt or decrypt your data.
-      #   'encryption' must also be set in order for this to have any effect.
-      # encryption_key: '<key>'
-      # Specifies Amazon S3 storage class to use for backups, this is optional
-      # storage_class: 'STANDARD'
-
   ## Pseudonymizer exporter
   pseudonymizer:
     # Tables manifest that specifies the fields to extract and pseudonymize.

From e587dffc533b60a0a900014f6057acd3c2d7419d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 22 May 2020 21:08:28 +0200
Subject: [PATCH 0482/1124] Upgrade GitLab CE to 13.0.0

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d00c9a0f9..1859bd9e7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.0**
+- gitlab: upgrade CE to v13.0.0
+
 **12.10.6**
 - gitlab: upgrade CE to v12.10.6
 
diff --git a/Dockerfile b/Dockerfile
index 16f87ddf1..2940424cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=12.10.6
+ARG VERSION=13.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=12.2.0 \
     GITLAB_WORKHORSE_VERSION=8.30.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
-    GITALY_SERVER_VERSION=12.10.6 \
+    GITALY_SERVER_VERSION=13.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1a497cb28..6c00aaa16 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:12.10.6
+# sameersbn/gitlab:13.0.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -122,7 +122,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.6
+docker pull sameersbn/gitlab:13.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -191,7 +191,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -226,7 +226,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 ## Database
@@ -259,7 +259,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -303,7 +303,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -330,7 +330,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 ### Linking to Redis Container
@@ -357,7 +357,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 ### Mail
@@ -370,7 +370,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -390,7 +390,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -467,7 +467,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -483,7 +483,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.10.6
+ sameersbn/gitlab:13.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -506,7 +506,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -554,7 +554,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -735,14 +735,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.10.6
+    sameersbn/gitlab:13.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:sanitize
+    sameersbn/gitlab:13.0.0 app:sanitize
 ```
 
 ### Piwik
@@ -1124,7 +1124,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1159,14 +1159,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake db:setup
+    sameersbn/gitlab:13.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1175,7 +1175,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1225,7 +1225,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1238,7 +1238,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1269,7 +1269,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1291,12 +1291,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.10.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.6
+docker pull sameersbn/gitlab:13.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1322,7 +1322,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.10.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.0
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index a3d2194c1..02161ca86 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.10.6
+13.0.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ee866602..b5db3e937 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:12.10.6
+    image: sameersbn/gitlab:13.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7125c76a0..97e68a266 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.10.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.10.6
+docker pull sameersbn/gitlab:13.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:12.10.6
+sameersbn/gitlab:13.0.0
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bd383bb3a..048684491 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:12.10.6
+        image: sameersbn/gitlab:13.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 1ca4c9c91d2099dd1246ef3f3087d3c6817eeb02 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 22 May 2020 21:08:41 +0200
Subject: [PATCH 0483/1124] Update gitlab-shell to 13.2.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2940424cd..536231ea1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=13.0.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
-    GITLAB_SHELL_VERSION=12.2.0 \
+    GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.30.1 \
     GITLAB_PAGES_VERSION=1.17.0 \
     GITALY_SERVER_VERSION=13.0.0 \

From ea6a9bb3da80a6636ff9d18058c70b7bec308e4d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 22 May 2020 21:08:41 +0200
Subject: [PATCH 0484/1124] Update gitlab-workhorse to 8.31.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 536231ea1..16a44de4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=13.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.30.1 \
+    GITLAB_WORKHORSE_VERSION=8.31.0 \
     GITLAB_PAGES_VERSION=1.17.0 \
     GITALY_SERVER_VERSION=13.0.0 \
     GITLAB_USER="git" \

From c83c65562b861dc0b11e13dd43bbb325669e1f36 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 22 May 2020 21:08:42 +0200
Subject: [PATCH 0485/1124] Update gitlab-pages to 1.18.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 16a44de4f..d470e88ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.0 \
-    GITLAB_PAGES_VERSION=1.17.0 \
+    GITLAB_PAGES_VERSION=1.18.0 \
     GITALY_SERVER_VERSION=13.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 44e6c902109b396cf276adeb632d88c0e23c2b3d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 24 May 2020 15:04:05 +0200
Subject: [PATCH 0486/1124] chore: upgrade postgres to
 sameersbn/postgresql:11-20200524

Signed-off-by: solidnerd <niclas@mietz.io>
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b5db3e937..5549ce453 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:10-2
+    image: sameersbn/postgresql:11-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:

From e2720dcb768c605cd135f87b655b4789d2d9dfc9 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 24 May 2020 15:04:28 +0200
Subject: [PATCH 0487/1124] chore: upgrade redis to redis:5.0.9

Signed-off-by: solidnerd <niclas@mietz.io>
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5549ce453..b15e62b94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-2
+    image: redis:5.0.9
     command:
     - --loglevel warning
     volumes:

From 1c3c1aa7d0761805bc518bfab9d803379f5b4c70 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 May 2020 05:50:37 +0200
Subject: [PATCH 0488/1124] fix: revert #1443 of mapping uid and gid

This is only a revert only of #1443 to get back in functional working.

Closes #2144
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 2390fe83c..f0ffc7874 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1311,7 +1311,7 @@ map_uidgid() {
     echo "Mapping UID and GID for ${GITLAB_USER}:${GITLAB_USER} to $USERMAP_UID:$USERMAP_GID"
     groupmod -o -g ${USERMAP_GID} ${GITLAB_USER}
     sed -i -e "s|:${USERMAP_ORIG_UID}:${USERMAP_GID}:|:${USERMAP_UID}:${USERMAP_GID}:|" /etc/passwd
-    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* \( ! -uid ${USERMAP_ORIG_UID} -o ! -gid ${USERMAP_ORIG_GID} \) -print0 | xargs -0 chown -h ${GITLAB_USER}: ${GITLAB_HOME}
+    find ${GITLAB_HOME} -path ${GITLAB_DATA_DIR}/\* -prune -o -print0 | xargs -0 chown -h ${GITLAB_USER}:
   fi
 }
 

From ae6fad48c471283b1f65d2efe5f64a444b8ef6b8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Mon, 25 May 2020 06:07:54 +0200
Subject: [PATCH 0489/1124] chore: sync configs

---
 assets/runtime/config/gitlabhq/gitlab.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 1f63a891c..4a6bff9f8 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -110,6 +110,9 @@ production: &base
       # Default is '.gitlab_smime_cert' relative to Rails.root (i.e. root of the GitLab app).
       cert_file: {{GITLAB_EMAIL_SMIME_CERT_FILE}}
       #end-email-smime
+      # S/MIME extra CA public certificates in PEM format, will be attached to signed messages
+      # Optional
+      # ca_certs_file: /home/git/gitlab/.gitlab_smime_ca_certs
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
 
@@ -205,6 +208,9 @@ production: &base
     #
     # log_path: log/mail_room_json.log
 
+    # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+    expunge_deleted: false
+
   ## Build Artifacts
   artifacts:
     enabled: {{GITLAB_ARTIFACTS_ENABLED}}
@@ -801,7 +807,7 @@ production: &base
     # Allow smartcard authentication
     enabled: false
 
-    # Path to a file containing a CA certificate
+    # Path to a file containing a CA certificate bundle
     ca_file: '/etc/ssl/certs/CA.pem'
 
     # Host and port where the client side certificate is requested by the
@@ -1119,6 +1125,11 @@ production: &base
   git:
     bin_path: /usr/bin/git
 
+  ## ActionCable settings
+  action_cable:
+    # Number of threads used to process ActionCable connection callbacks and channel actions
+    # worker_pool_size: 4
+
   ## Webpack settings
   # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
   # on a given port instead of serving directly from /assets/webpack. This is only indended for use

From 74013d82ab1e15f4e7e0f6c212a8047bc01eb3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Wed, 6 May 2020 07:13:03 +0200
Subject: [PATCH 0490/1124] feat: Add healthcheck for gitlab service

---
 README.md                                 | 47 ++++++++++++++++++++++-
 assets/build/install.sh                   | 10 +++++
 assets/runtime/config/gitlabhq/gitlab.yml |  1 +
 docker-compose.yml                        |  8 +++-
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6c00aaa16..9698b3e9b 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,9 @@
     - [Import Repositories](#import-repositories)
     - [Upgrading](#upgrading)
     - [Shell Access](#shell-access)
-- [Features](#features)
- - [Container Registry](docs/container_registry.md)
+- [Monitoring](#monitoring)
+    - [Health Check](#health-check)
+- [Container Registry](docs/container_registry.md)
 - [References](#references)
 
 # Introduction
@@ -1333,6 +1334,48 @@ For debugging and maintenance purposes you may want access the containers shell.
 docker exec -it gitlab bash
 ```
 
+# Monitoring
+
+You can monitor your GitLab instance status as described in the [official documentation](https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html), for example:
+
+```bash
+curl 'https://gitlab.example.com/-/liveness'
+```
+
+On success, the endpoint will return a `200` HTTP status code, and a response like below.
+
+```bash
+{
+   "status": "ok"
+}
+```
+
+To do that you will need to set the environment variable `GITLAB_MONITORING_IP_WHITELIST` to allow your IP or subnet to make requests to your GitLab instance.
+
+## Health Check
+
+You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks:
+
+```yml
+version: '2.3'
+
+services:
+  gitlab:
+    image: sameersbn/gitlab:12.7.7
+    healthcheck:
+      test: ["CMD", "/usr/local/sbin/healthcheck"]
+      interval: 1m
+      timeout: 5s
+      retries: 5
+      start_period: 2m
+```
+
+Then you will be able to consult the healthcheck log by executing:
+
+```bash
+docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq
+```
+
 # References
 
 * https://github.com/gitlabhq/gitlabhq
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 8b7fbe024..9127178bb 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -426,6 +426,16 @@ programs=sshd,nginx,mail_room,cron
 priority=20
 EOF
 
+# configure healthcheck script
+## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html
+cat > /usr/local/sbin/healthcheck <<EOF
+#!/bin/bash
+url=http://localhost/-/liveness
+curl -s \$url
+[[ "\$(curl -s -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
+EOF
+chmod +x /usr/local/sbin/healthcheck
+
 # purge build dependencies and cleanup apt
 DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
 rm -rf /var/lib/apt/lists/*
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 4a6bff9f8..7f9b61401 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1149,6 +1149,7 @@ production: &base
     # puma_sampler_interval: 5
     # IP whitelist to access monitoring endpoints
     ip_whitelist:
+      - 127.0.0.0/8
       - {{GITLAB_MONITORING_IP_WHITELIST}}
 
     # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics
diff --git a/docker-compose.yml b/docker-compose.yml
index b15e62b94..3089c867e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.3'
 
 services:
   redis:
@@ -31,6 +31,12 @@ services:
     - "10022:22"
     volumes:
     - gitlab-data:/home/git/data:Z
+    healthcheck:
+      test: ["CMD", "/usr/local/sbin/healthcheck"]
+      interval: 5m
+      timeout: 10s
+      retries: 3
+      start_period: 5m
     environment:
     - DEBUG=false
 

From 32250932ed0904ad3b8cab1cd53a7e5696c61f6d Mon Sep 17 00:00:00 2001
From: xps2 <9610872+xps2@users.noreply.github.com>
Date: Wed, 27 May 2020 02:22:00 +0900
Subject: [PATCH 0491/1124] upgrade postgres to 11

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

diff --git a/Dockerfile b/Dockerfile
index d470e88ee..a2d3baaa3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ RUN set -ex && \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server postgresql-client-10 postgresql-contrib-10 redis-tools \
+      nginx openssh-server postgresql-client-11 postgresql-contrib-11 redis-tools \
       git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm5 libreadline7 libncurses5 libffi6 \

From 6e1ded73b5c90ab3786c983629410384ec5b8ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 13:47:03 +0200
Subject: [PATCH 0492/1124] =?UTF-8?q?=E2=9C=A8=20Add=20default=20for=20GIT?=
 =?UTF-8?q?LAB=5FREGISTRY=5FGENERATE=5FINTERNAL=5FCERTIFICATES?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/runtime/env-defaults | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index c4899f5ff..e3a7362c3 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -204,6 +204,7 @@ GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
 GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://localhost:5000/}
 GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-config/registry.key}
 GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
+GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}
 
 ## SSL
 SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}

From 998c4918778434696e819692f478f819681ced01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 13:47:28 +0200
Subject: [PATCH 0493/1124] =?UTF-8?q?=E2=9C=A8=20Implement=20function=20ge?=
 =?UTF-8?q?nerate=5Fregistry=5Fcertificates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/runtime/functions | 51 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index f0ffc7874..ee1d3f95d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1863,3 +1863,54 @@ execute_raketask() {
   echo "Running raketask ${1}..."
   exec_as_git bundle exec rake $@ ${BACKUP:+BACKUP=$BACKUP}
 }
+
+generate_registry_certificates() {
+  if [[ ${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES} == true ]]; then
+    echo 'Generating GitLab Registry internal certificates for communication between Gitlab and a Docker Registry'
+    # Get directory from cert file path
+    if [[ -z $GITLAB_REGISTRY_KEY_PATH ]]; then
+        echo "\$GITLAB_REGISTRY_KEY_PATH is empty"
+        return 1
+    fi
+    DIRECTORY=$(dirname "$GITLAB_REGISTRY_KEY_PATH")
+    echo "Registry internal certificates will be generated in directory: $DIRECTORY"
+    # Make certs directory if it doesn't exists
+    mkdir -p "$DIRECTORY"
+    # Go to the temporary directory
+    cd "$DIRECTORY" || return
+    # Get key filename
+    KEY_FILENAME=$(basename "$GITLAB_REGISTRY_KEY_PATH")
+    echo "Registry internal key filename: $KEY_FILENAME"
+    # Generate cert filename, by default, in same directory as $KEY_FILENAME, with same name, but with extension .crt
+    CERT_FILENAME=$(echo "$KEY_FILENAME" | sed "s|key|crt|" -)
+    echo "Registry internal cert filename: $CERT_FILENAME"
+    # Generate a random password password_file used in the next commands
+    if [[ -f password_file ]] ; then
+        echo "password_file exists"
+    else
+        openssl rand -hex -out password_file 32
+    fi
+    # Create a PKCS#10 certificate request
+    echo "Generating internal certificate request"
+    if [[ -f registry.csr ]] ; then
+        echo "registry.csr exists"
+    else
+        openssl req -new -passout file:password_file -newkey rsa:4096 -batch > registry.csr
+    fi
+    # Process RSA key
+    echo "Processing RSA internal key"
+    if [[ -f $KEY_FILENAME ]] ; then
+        echo "$KEY_FILENAME exists"
+    else
+        openssl rsa -passin file:password_file -in privkey.pem -out "$KEY_FILENAME"
+    fi
+
+    # Generate certificate
+    echo "Generating internal certificate"
+    if [[ -f $CERT_FILENAME ]] ; then
+        echo "$CERT_FILENAME exists"
+    else
+        openssl x509 -in registry.csr -out "$CERT_FILENAME" -req -signkey "$KEY_FILENAME" -days 10000
+    fi
+  fi
+}

From 12d8e3a009b653d61d715b4ea6c984e8ca81a740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 18:04:08 +0200
Subject: [PATCH 0494/1124] =?UTF-8?q?=E2=9C=A8=20Add=20Docker=20Compose=20?=
 =?UTF-8?q?swarm=20stack?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 241 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 241 insertions(+)
 create mode 100644 docker-compose.swarm.yml

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
new file mode 100644
index 000000000..511d4682f
--- /dev/null
+++ b/docker-compose.swarm.yml
@@ -0,0 +1,241 @@
+version: '3.3'
+services:
+  redis:
+    image: redis:5.0.9
+    command:
+    - --loglevel warning
+    volumes:
+    - redis-data:/var/lib/redis:Z
+    deploy:
+      placement:
+        constraints:
+          - node.labels.gitlab.redis-data == true
+
+  postgresql:
+    image: sameersbn/postgresql:12-20200524
+    volumes:
+    - postgresql-data:/var/lib/postgresql:Z
+    environment:
+    - DB_USER=gitlab
+    - DB_PASS=password
+    - DB_NAME=gitlabhq_production
+    - DB_EXTENSION=pg_trgm
+    deploy:
+      placement:
+        constraints:
+          - node.labels.gitlab.postgresql-data == true
+
+  registry:
+    image: registry:2
+    depends_on:
+      - gitlab
+    volumes:
+      - registry-data:/registry
+      - certs-data:/certs
+    environment:
+      - REGISTRY_LOG_LEVEL=${REGISTRY_LOG_LEVEL:-info}
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=${REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY:-/registry}
+      - REGISTRY_AUTH_TOKEN_REALM=https://${GITLAB_HOST?Variable not set}/jwt/auth
+      - REGISTRY_AUTH_TOKEN_SERVICE=${REGISTRY_AUTH_TOKEN_SERVICE:-container_registry}
+      - REGISTRY_AUTH_TOKEN_ISSUER=${REGISTRY_AUTH_TOKEN_ISSUER:-gitlab-issuer}
+      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=${REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE:-/certs/registry.crt}
+      - REGISTRY_STORAGE_DELETE_ENABLED=${REGISTRY_STORAGE_DELETE_ENABLED:-true}
+    deploy:
+      placement:
+        constraints:
+          - node.labels.gitlab.certs-data == true
+      labels:
+        - traefik.enable=true
+        - traefik.docker.network=traefik-public
+        - traefik.constraint-label=traefik-public
+        - traefik.http.routers.gitlab-registry-http.rule=Host(`${REGISTRY_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-registry-http.entrypoints=http
+        - traefik.http.routers.gitlab-registry-http.middlewares=https-redirect
+        - traefik.http.routers.gitlab-registry-https.rule=Host(`${REGISTRY_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-registry-https.entrypoints=https
+        - traefik.http.routers.gitlab-registry-https.tls=true
+        - traefik.http.routers.gitlab-registry-https.tls.certresolver=le
+        - traefik.http.services.gitlab-registry.loadbalancer.server.port=5000
+    networks:
+      # To communicate with other services in this stack
+      - default
+      # To be available for the public Traefik
+      - traefik-public
+
+  gitlab:
+    image: sameersbn/gitlab:13.0.0
+    depends_on:
+    - redis
+    - postgresql
+    ports:
+      # Listen on port 22, default for SSH and Git in host mode (only in its host)
+      # So other nodes in the cluster can keep listening on port 22
+      - target: 22
+        published: 22
+        mode: host
+    volumes:
+    - gitlab-data:/home/git/data:Z
+    - certs-data:/certs
+    networks:
+      # To communicate with other services in this stack
+      - default
+      # To be available for the public Traefik
+      - traefik-public
+    environment:
+    - DEBUG=false
+
+    - GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-true}
+    - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
+    - GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
+    - GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://registry:5000}
+    - GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-/certs/registry.key}
+    - GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
+    - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-true}
+
+    - GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-false}
+
+    - DB_ADAPTER=${DB_ADAPTER:-postgresql}
+    - DB_HOST=${DB_HOST:-postgresql}
+    - DB_PORT=${DB_PORT:-5432}
+    - DB_USER=${DB_USER:-gitlab}
+    - DB_PASS=${DB_PASS:-password}
+    - DB_NAME=${DB_NAME:-gitlabhq_production}
+
+    - REDIS_HOST=${REDIS_HOST:-redis}
+    - REDIS_PORT=${REDIS_PORT:-6379}
+
+    - TZ=${TZ:-Asia/Kolkata}
+    - GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-Kolkata}
+
+    - GITLAB_HTTPS=${GITLAB_HTTPS:-true}
+    - SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}
+
+    - GITLAB_HOST=${GITLAB_HOST?Variable not set}
+    - GITLAB_PORT=${GITLAB_PORT:-443}
+    - GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
+    - GITLAB_RELATIVE_URL_ROOT=${GITLAB_RELATIVE_URL_ROOT}
+    - GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE?Variable not set}
+    - GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE?Variable not set}
+    - GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE?Variable not set}
+
+    - GITLAB_ROOT_PASSWORD=${GITLAB_ROOT_PASSWORD?Variable not set}
+    - GITLAB_ROOT_EMAIL=${GITLAB_ROOT_EMAIL-:admin@${GITLAB_HOST}}
+
+    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
+    - GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
+
+    - GITLAB_EMAIL=${GITLAB_EMAIL:-notifications@${GITLAB_HOST?Variable not set}}
+    - GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@${GITLAB_HOST?Variable not set}}
+    - GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS:-reply@${GITLAB_HOST?Variable not set}}
+
+    - GITLAB_BACKUP_SCHEDULE=${GITLAB_BACKUP_SCHEDULE:-daily}
+    - GITLAB_BACKUP_TIME=${GITLAB_BACKUP_TIME:-01:00}
+
+    - SMTP_ENABLED=${SMTP_ENABLED:-false}
+    - SMTP_DOMAIN=${SMTP_DOMAIN:-www.example.com}
+    - SMTP_HOST=${SMTP_HOST:-smtp.gmail.com}
+    - SMTP_PORT=${SMTP_PORT:-587}
+    - SMTP_USER=${SMTP_USER:-mailer@example.com}
+    - SMTP_PASS=${SMTP_PASS:-password}
+    - SMTP_STARTTLS=${SMTP_STARTTLS:-true}
+    - SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION:-login}
+
+    - IMAP_ENABLED=${IMAP_ENABLED:-false}
+    - IMAP_HOST=${IMAP_HOST:-imap.gmail.com}
+    - IMAP_PORT=${IMAP_PORT:-993}
+    - IMAP_USER=${IMAP_USER:-mailer@example.com}
+    - IMAP_PASS=${IMAP_PASS:-password}
+    - IMAP_SSL=${IMAP_SSL:-true}
+    - IMAP_STARTTLS=${IMAP_STARTTLS:-false}
+
+    - OAUTH_ENABLED=${OAUTH_ENABLED:-false}
+    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER}
+    - OAUTH_ALLOW_SSO=${OAUTH_ALLOW_SSO}
+    - OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true}
+    - OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
+    - OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false}
+    - OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS}
+
+    - OAUTH_CAS3_LABEL=${OAUTH_CAS3_LABEL:-cas3}
+    - OAUTH_CAS3_SERVER=${OAUTH_CAS3_SERVER}
+    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=${OAUTH_CAS3_DISABLE_SSL_VERIFICATION:-false}
+    - OAUTH_CAS3_LOGIN_URL=${OAUTH_CAS3_LOGIN_URL:-/cas/login}
+    - OAUTH_CAS3_VALIDATE_URL=${OAUTH_CAS3_VALIDATE_URL:-/cas/p3/serviceValidate}
+    - OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout}
+
+    - OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY}
+    - OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
+    - OAUTH_GOOGLE_RESTRICT_DOMAIN=${OAUTH_GOOGLE_RESTRICT_DOMAIN}
+
+    - OAUTH_FACEBOOK_API_KEY=${OAUTH_FACEBOOK_API_KEY}
+    - OAUTH_FACEBOOK_APP_SECRET=${OAUTH_FACEBOOK_APP_SECRET}
+
+    - OAUTH_TWITTER_API_KEY=${OAUTH_TWITTER_API_KEY}
+    - OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET}
+
+    - OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY}
+    - OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET}
+    - OAUTH_GITHUB_URL=${OAUTH_GITHUB_URL}
+    - OAUTH_GITHUB_VERIFY_SSL=${OAUTH_GITHUB_VERIFY_SSL}
+
+    - OAUTH_GITLAB_API_KEY=${OAUTH_GITLAB_API_KEY}
+    - OAUTH_GITLAB_APP_SECRET=${OAUTH_GITLAB_APP_SECRET}
+
+    - OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY}
+    - OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET}
+
+    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=${OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL}
+    - OAUTH_SAML_IDP_CERT_FINGERPRINT=${OAUTH_SAML_IDP_CERT_FINGERPRINT}
+    - OAUTH_SAML_IDP_SSO_TARGET_URL=${OAUTH_SAML_IDP_SSO_TARGET_URL}
+    - OAUTH_SAML_ISSUER=${OAUTH_SAML_ISSUER}
+    - OAUTH_SAML_LABEL=${OAUTH_SAML_LABEL:-"Our SAML Provider"}
+    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=${OAUTH_SAML_NAME_IDENTIFIER_FORMAT:-urn:oasis:names:tc:SAML:2.0:nameid-format:transient}
+    - OAUTH_SAML_GROUPS_ATTRIBUTE=${OAUTH_SAML_GROUPS_ATTRIBUTE}
+    - OAUTH_SAML_EXTERNAL_GROUPS=${OAUTH_SAML_EXTERNAL_GROUPS}
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL}
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME}
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME}
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME}
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME}
+
+    - OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL}
+    - OAUTH_CROWD_APP_NAME=${OAUTH_CROWD_APP_NAME}
+    - OAUTH_CROWD_APP_PASSWORD=${OAUTH_CROWD_APP_PASSWORD}
+
+    - OAUTH_AUTH0_CLIENT_ID=${OAUTH_AUTH0_CLIENT_ID}
+    - OAUTH_AUTH0_CLIENT_SECRET=${OAUTH_AUTH0_CLIENT_SECRET}
+    - OAUTH_AUTH0_DOMAIN=${OAUTH_AUTH0_DOMAIN}
+    - OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE}
+
+    - OAUTH_AZURE_API_KEY=${OAUTH_AZURE_API_KEY}
+    - OAUTH_AZURE_API_SECRET=${OAUTH_AZURE_API_SECRET}
+    - OAUTH_AZURE_TENANT_ID=${OAUTH_AZURE_TENANT_ID}
+
+    - RACK_ATTACK_ENABLED=${RACK_ATTACK_ENABLED:-false}
+    deploy:
+      placement:
+        constraints:
+          - node.labels.gitlab.certs-data == true
+      labels:
+        - traefik.enable=true
+        - traefik.docker.network=traefik-public
+        - traefik.constraint-label=traefik-public
+        - traefik.http.routers.gitlab-registry-http.rule=Host(`${GITLAB_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-registry-http.entrypoints=http
+        - traefik.http.routers.gitlab-registry-http.middlewares=https-redirect
+        - traefik.http.routers.gitlab-registry-https.rule=Host(`${GITLAB_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-registry-https.entrypoints=https
+        - traefik.http.routers.gitlab-registry-https.tls=true
+        - traefik.http.routers.gitlab-registry-https.tls.certresolver=le
+        - traefik.http.services.gitlab-registry.loadbalancer.server.port=8181
+
+volumes:
+  redis-data:
+  postgresql-data:
+  gitlab-data:
+  registry-data:
+  certs-data:
+
+networks:
+  traefik-public:
+    external: true

From af02cf841f28d1779133f01e3f25781430948071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 18:04:50 +0200
Subject: [PATCH 0495/1124] =?UTF-8?q?=F0=9F=93=9D=20Add=20docs=20for=20dep?=
 =?UTF-8?q?loying=20GitLab=20in=20Docker=20Swarm=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/docker-swarm-traefik-registry.md | 409 ++++++++++++++++++++++++++
 1 file changed, 409 insertions(+)
 create mode 100644 docs/docker-swarm-traefik-registry.md

diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md
new file mode 100644
index 000000000..d3ccfb601
--- /dev/null
+++ b/docs/docker-swarm-traefik-registry.md
@@ -0,0 +1,409 @@
+# Docker Swarm mode deployment
+
+Here's a guide to deploy **GitLab** with:
+
+* [Docker Swarm mode](https://docs.docker.com/engine/swarm/) for cluster management and orchestration.
+* [Docker Registry](https://docs.docker.com/registry/) with HTTPS, TLS (SSL) handled automatically, using GitLab credentials and integration with GitLab CI.
+* [Traefik](https://traefik.io/) proxy to handle domain based redirection, HTTPS communication and automatic certificate generation with [Let's encrypt](https://letsencrypt.org/). You don't need to build a custom Nginx proxy or anything similar, it's all handled by Traefik.
+* Automatic generation and configuration of GitLab / Registry internal communication certificates.
+
+## Set up Docker Swarm
+
+Set up a Docker Swarm mode cluster with a main global Traefik load balancer following the guide at [DockerSwarm.rocks](https://dockerswarm.rocks).
+
+It will take you less than 20 minutes to follow it to deploy a cluster (of one or more machines) and have it ready for the next steps.
+
+## Configure DNS records
+
+Configure your DNS domain records to point one subdomain for your GitLab instance and one subdomain for the Docker Registry to the new server.
+
+For example, a DNS `A` record for `gitlab.example.com` and a DNS `A` record for `registry.example.com`.
+
+If you have a cluster with several nodes, make sure those DNS records point to the IP of the node that will host the `gitlab` and `registry` services.
+
+This is because `gitlab` has to listen on port `22` for Git to work, but we will configure it to make it listen on port `22` only on the server that has GitLab.
+
+That way, if you have other servers in your cluster, you won't have to change the default SSH port of all of them.
+
+## Modify the server SSH port
+
+As by default Git uses the same SSH port `22`, and you want your GitLab container to use that port, modify your server SSH configuration to use a different port. This guide will assume you will use port `2222` for your server SSH and port `22` for your GitLab.
+
+Connect to your remote server as normally, e.g.:
+
+```bash
+ssh root@gitlab.example.com
+```
+
+Create a backup of your SSH config file:
+
+```bash
+cp /etc/ssh/sshd_config /etc/ssh/sshd_config.backup
+```
+
+Modify your SSH config.
+
+**Warning**: if something is broken after modifying the SSH configuration, you could lock yourself out of the server.
+
+You need to have a line `Port 2222` and make sure there's no line `Port 22`.
+
+You can use this command to do it automatically, it will check for a line with `Port 22` or `#Port 22` and replace it with `Port 2222`.
+
+```bash
+sed -i 's|^#\?Port 22$|Port 2222|' /etc/ssh/sshd_config
+```
+
+Or you can modify it with `nano` by hand, with:
+
+```bash
+nano /etc/ssh/sshd_config
+```
+
+Confirm that there's a single line with `Port 2222` with:
+
+```bash
+grep "^Port" /etc/ssh/sshd_config
+```
+
+Then restart the SSH server:
+
+```bash
+systemctl restart sshd.service
+```
+
+**Warning**: at this point, if you lose your connection and something was wrong in the configuration, you could lock yourself out of the server. Run the following steps in a new terminal session, without closing the existing one, so that, if something was wrong, you can use the current session to edit the configurations, revert them, and restart the SSH service, before being locked out.
+
+In a different terminal session, without closing the existing one, try connecting with SSH to your server using the new port, e.g.:
+
+```bash
+ssh -p 2222 root@gitlab.example.com
+```
+
+If you get connected to the remote server normally, everything is working correctly.
+
+## Download the Docker Compose stack file
+
+* Download the Docker Compose stack file:
+
+```bash
+curl -L https://raw.githubusercontent.com/sameersbn/docker-gitlab/master/docker-compose.swarm.yml -o docker-compose.swarm.yml
+```
+
+## Set environment variables
+
+Set and export the environment variables `GITLAB_HOST` and `REGISTRY_HOST` to the subdomains you configured.
+
+For example:
+
+```bash
+export GITLAB_HOST=gitlab.example.com
+export REGISTRY_HOST=registry.example.com
+```
+
+You will use the domain for `GITLAB_HOST` to access GitLab in your browser and to commit with Git.
+
+And you will use the domain for `REGISTRY_HOST` to store, push, and pull Docker images, e.g.:
+
+```bash
+docker pull registry.example.com/mygroup/myproject/imagename:sometag
+```
+
+These environment variables will be used by the file `docker-compose.swarm.yml`.
+
+They are used inside of the stacks and are also used to configure the domains for the Traefik load balancer. Because of that, you need to export them.
+
+## Other environment variables
+
+There are many additional environment variables with different configurations.
+
+Read the [main README](https://github.com/sameersbn/docker-gitlab) for all the options.
+
+For Registry specific options and details, check the main [GitLab Registry documentation in this repo](https://github.com/sameersbn/docker-gitlab/blob/master/docs/container_registry.md).
+
+You can configure them by exporting the environment variables you want to use like you did for `GITLAB_HOST` and `REGISTRY_HOST`, or you can also edit de file `docker-compose.swarm.yml` directly.
+
+If you want to edit the file directly, you can do it in the command line with a program like `nano`, e.g.:
+
+```bash
+nano docker-compose.swarm.yml
+```
+
+You could want to edit the file directly to preserve the values that you used for deploying your stack.
+
+## Set other environment variables
+
+If you want anyone to sign up instead of only people with invitation, change `GITLAB_SIGNUP_ENABLED` to `true`:
+
+```bash
+export GITLAB_SIGNUP_ENABLED=true
+```
+
+There are several environment variables that require random strings for keys and passwords.
+
+For the sections that require generating random strings for keys and passwords, each time, run the following command and copy the output:
+
+```bash
+openssl rand -hex 32
+# Outputs something like: 99d3b1f01aa639e4a76f4fc281fc834747a543720ba4c8a8648ba755aef9be7f
+```
+
+You can copy it and set it in the file like:
+
+```yaml
+- GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+- GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+- GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+```
+
+Or you can do it by exporting variables like:
+
+```bash
+export GITLAB_SECRETS_DB_KEY_BASE=$(openssl rand -hex 32)
+export GITLAB_SECRETS_SECRET_KEY_BASE=$(openssl rand -hex 32)
+export GITLAB_SECRETS_OTP_KEY_BASE=$(openssl rand -hex 32)
+```
+
+that will assign a new random string to each environment variable.
+
+* Set `GITLAB_ROOT_PASSWORD` to the key of the main first administrator user:
+
+```bash
+export GITLAB_ROOT_PASSWORD=change-this-admin-password
+```
+
+* Set `GITLAB_ROOT_EMAIL` to the email of the main first administrator user:
+
+```bash
+export GITLAB_ROOT_EMAIL=admin@example.com
+```
+
+...by default `admin@${GITLAB_HOST}`.
+
+* Set the appropriate email accounts for the following variables:
+
+```bash
+export GITLAB_EMAIL=notifications@git.example.com
+export GITLAB_EMAIL_REPLY_TO=noreply@git.example.com
+export GITLAB_INCOMING_EMAIL_ADDRESS=reply@git.example.com
+```
+
+...by default:
+
+* `GITLAB_EMAIL`: `notifications@${GITLAB_HOST}`
+* `GITLAB_EMAIL_REPLY_TO`: `noreply@${GITLAB_HOST}`
+* `GITLAB_INCOMING_EMAIL_ADDRESS`: `reply@${GITLAB_HOST}`
+
+## Copy the file
+
+If you modified the file locally, make sure you copy it to your remote server, e.g.:
+
+```bash
+scp -P 2222 docker-compose.swarm.yml root@gitlab.example.com:/root/
+```
+
+and connect via SSH to your remote server, e.g.:
+
+```bash
+ssh -p 2222 root@gitlab.example.com
+```
+
+If you modified the file locally and then connected to your server later, make sure you export any missing environment variables.
+
+Specially `GITLAB_HOST` and `REGISTRY_HOST` that are needed as env vars even if you modified the Docker Compose file (as those are used in the Traefik labels).
+
+## About volumes, labels, and constraints
+
+Because the Docker Swarm cluster may have more than one single node (machine) in the cluster, we need to make sure that the services that need to save and read files from volumes are always deployed to the same node.
+
+For example, the service for `redis` uses a volume, you can check it on the file:
+
+```yaml
+    volumes:
+    - redis-data:/var/lib/redis:Z
+```
+
+To make sure `redis` is always deployed to the same node that contains the same volume `redis-data`, we have a constraint:
+
+```yaml
+    deploy:
+      placement:
+        constraints:
+          - node.labels.gitlab.redis-data == true
+```
+
+This tells Docker that the service `redis` should be deployed to a Docker node (a machine in the cluster) with the label `node.labels.gitlab.redis-data=true`.
+
+Then we can make one node have this label, and Docker Swarm will always deploy the `redis` service to the same node.
+
+## Add constraint labels
+
+Now we are going to add the needed labels to satisfy those constraints, to make sure the volumes work correctly.
+
+* Connect to a manager node in your Docker Swarm cluster. It could be the same server that will run GitLab, or it could be a different one.
+
+* If you are deploying the stack in the same current manager node, get its node ID and store it in an environment variable:
+
+```bash
+export NODE_ID=$(docker info -f '{{.Swarm.NodeID}}')
+```
+
+* Otherwise, you can check the current available nodes with:
+
+```console
+$ docker node ls
+
+ID                            HOSTNAME             STATUS   AVAILABILITY   MANAGER STATUS   ENGINE VERSION
+m48gz5e8ucmk59af4m6enmnaz *   dog.example.com      Ready    Active         Leader           19.03.9
+4w456u9lnanau629v3y456k9d     cat.example.com      Ready    Active                          19.03.9
+mue36qqwqnzrqt4iqi0yyd6ie     gitlab.example.com   Ready    Active                          19.03.9
+```
+
+And select the node where you want to deploy the main `gitlab` service. In this example, in the `HOSTNAME` `gitlab.example.com`, with node ID `mue36qqwqnzrqt4iqi0yyd6ie`.
+
+So, you could export that environment variable with that node with:
+
+```bash
+export NODE_ID=mue36qqwqnzrqt4iqi0yyd6ie
+```
+
+* Create a tag in that node, so that the service `gitlab` and `registry` are always deployed to the same node and use the same volumes:
+
+```bash
+docker node update --label-add gitlab.certs-data=true $NODE_ID
+```
+
+We need to make sure `gitlab` and `registry` are deployed on the same node because they share the same volume with the TLS certificates generated by `gitlab`.
+
+Now create the label for `redis`. You could use another node in your cluster if you have more than one, for simplicity we are going to use the same node, e.g.:
+
+```bash
+docker node update --label-add gitlab.redis-data=true $NODE_ID
+```
+
+And add the label for `postgres`:
+
+```bash
+docker node update --label-add gitlab.postgresql-data=true $NODE_ID
+```
+
+## Deploy the stack
+
+Now, having the labels set in the Docker nodes, and the environment variables exported, you can deploy your stack:
+
+```bash
+docker stack deploy --compose-file docker-compose.swarm.yml gitlab
+```
+
+You can check the status of the deployment with:
+
+```bash
+docker stack ps gitlab
+```
+
+Or check the logs, for example for the service `gitlab_gitlab`:
+
+```bash
+docker service logs gitlab_gitlab
+```
+
+## Internal certificates
+
+GitLab and the Docker Registry have public facing HTTPS certificates generated with Let's Encrypt for each one. But to communicate between themselves they use an additional self-signed certificate.
+
+To tell GitLab to generate those self-signed certificates for the internal communication with GitLab, the `gitlab` service has an environment variable:
+
+```yaml
+- GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
+```
+
+GitLab will generate the certificates and store them in the location given by:
+
+```yaml
+- GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
+```
+
+And that location, `/certs`, is mounted as a named volume:
+
+```yaml
+    volumes:
+    - gitlab-data:/home/git/data:Z
+    - certs-data:/certs
+```
+
+So, the self-signed certificates will be generated inside the named volume `gitlab-certs`.
+
+And the Registry also has that named volume mounted:
+
+```yaml
+    volumes:
+      - registry-data:/registry
+      - certs-data:/certs
+```
+
+And the Registry is configured to look for the certificate in that same location that GitLab used to generate the certificate:
+
+```yaml
+- REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
+```
+
+## GitLab Runner in Docker
+
+If you use GitLab and want to integrate Continuous Integration / Continuous Deployment, you can follow this section to install the GitLab runner.
+
+You should create the runner using Docker standalone instead of in Docker Swarm mode, as you need the configurations to persist, and in Docker Swarm mode, the container could be deployed to a different server and you would loose those configurations.
+
+### Testing and Deployment
+
+For testing, the GitLab runner can run in any node.
+
+But if you want to deploy another runner (or the same) for deployment in the same Docker Swarm cluster, it has to run on a manager node.
+
+### Create the GitLab Runner in Docker standalone mode
+
+To install a GitLab runner in a standalone Docker run:
+
+```bash
+docker run -d \
+    --name gitlab-runner \
+    --restart always \
+    -v gitlab-runner:/etc/gitlab-runner \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    gitlab/gitlab-runner:latest
+```
+
+Then, enter into that container:
+
+```bash
+docker exec -it gitlab-runner bash
+```
+
+### Install the GitLab Runner
+
+* Go to the GitLab "Admin Area -> Runners" section.
+* Get the URL and create a variable in your Docker Manager's Terminal, e.g.:
+
+```bash
+export GITLAB_URL=https://gitlab.example.com/
+```
+
+* Get the registration token and create a variable in your Docker Manager's Terminal, e.g.:
+
+```bash
+export GITLAB_TOKEN=WYasdfJp4sdfasdf1234
+```
+
+* Run the next command editing the name and tags as you need, you can also edit the tags later in the web user interface.
+
+```bash
+gitlab-runner \
+    register -n \
+    --name "Docker Runner" \
+    --executor docker \
+    --docker-image docker:latest \
+    --docker-volumes /var/run/docker.sock:/var/run/docker.sock \
+    --url $GITLAB_URL \
+    --registration-token $GITLAB_TOKEN \
+    --tag-list dog-cat-cluster,stag,prod
+```
+
+* You can edit the runner more from the GitLab admin section.

From dd21b0761743a6f4c29ef54c60441d1030c17ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 18:05:14 +0200
Subject: [PATCH 0496/1124] =?UTF-8?q?=F0=9F=93=9D=20Update=20README=20and?=
 =?UTF-8?q?=20registry=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                  | 2 ++
 docs/container_registry.md | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9698b3e9b..0c3841fff 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@
 - [Monitoring](#monitoring)
     - [Health Check](#health-check)
 - [Container Registry](docs/container_registry.md)
+- [Deploy in Docker Swarm mode, with HTTPS handled by Traefik proxy and Docker Registry](docs/docker-swarm-traefik-registry.md)
 - [References](#references)
 
 # Introduction
@@ -882,6 +883,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_REGISTRY_KEY_PATH` | Sets the GitLab Registry Key Path. Defaults to `config/registry.key` |
 | `GITLAB_REGISTRY_DIR` | Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` |
 | `GITLAB_REGISTRY_ISSUER` | Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. |
+| `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` | Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt` |
 | `GITLAB_PAGES_ENABLED` | Enables the GitLab Pages. Defaults to `false`. |
 | `GITLAB_PAGES_DOMAIN` | Sets the GitLab Pages Domain. Defaults to `example.com` |
 | `GITLAB_PAGES_DIR` | Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` |
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 97e68a266..419a3b515 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -42,8 +42,13 @@ lifetime like this:
 ```bash
 mkdir certs
 cd certs
-openssl req -new -newkey rsa:4096 > registry.csr
-openssl rsa -in privkey.pem -out registry.key
+# Generate a random password password_file used in the next commands
+openssl rand -hex -out password_file 32
+# Create a PKCS#10 certificate request
+openssl req -new -passout file:password_file -newkey rsa:4096 -batch > registry.csr
+# Convert RSA key
+openssl rsa -passin file:password_file -in privkey.pem -out registry.key
+# Generate certificate
 openssl x509 -in registry.csr -out registry.crt -req -signkey registry.key -days 10000
 ```
 

From 6dae7e93823e11dd9e47d84363d08acf95dca636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 20:25:57 +0200
Subject: [PATCH 0497/1124] =?UTF-8?q?=F0=9F=94=A7=20Make=20email=20env=20v?=
 =?UTF-8?q?ars=20required?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 511d4682f..b1b2b684e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -119,14 +119,14 @@ services:
     - GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE?Variable not set}
 
     - GITLAB_ROOT_PASSWORD=${GITLAB_ROOT_PASSWORD?Variable not set}
-    - GITLAB_ROOT_EMAIL=${GITLAB_ROOT_EMAIL-:admin@${GITLAB_HOST}}
+    - GITLAB_ROOT_EMAIL=${GITLAB_ROOT_EMAIL?Variable not set}
 
     - GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
     - GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
 
-    - GITLAB_EMAIL=${GITLAB_EMAIL:-notifications@${GITLAB_HOST?Variable not set}}
-    - GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@${GITLAB_HOST?Variable not set}}
-    - GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS:-reply@${GITLAB_HOST?Variable not set}}
+    - GITLAB_EMAIL=${GITLAB_EMAIL:?Variable not set}
+    - GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO?Variable not set}
+    - GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS?Variable not set}
 
     - GITLAB_BACKUP_SCHEDULE=${GITLAB_BACKUP_SCHEDULE:-daily}
     - GITLAB_BACKUP_TIME=${GITLAB_BACKUP_TIME:-01:00}

From 408ea27b372a794920cd8017b6bc0ee28da708c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Mon, 25 May 2020 22:40:10 +0200
Subject: [PATCH 0498/1124] =?UTF-8?q?=F0=9F=94=A7=20Use=20same=20PostgreSQ?=
 =?UTF-8?q?L=20version=20as=20in=20main=20Docker=20Compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b1b2b684e..eb548e57b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:11-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:

From 3628752a02813a923452a3e73bb63183f00508f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 26 May 2020 19:51:49 +0200
Subject: [PATCH 0499/1124] =?UTF-8?q?=F0=9F=94=A7=20Simplify=20Docker=20Co?=
 =?UTF-8?q?mpose=20Swarm=20file=20and=20fix=20labels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 270 +++++++++++++++++++--------------------
 1 file changed, 135 insertions(+), 135 deletions(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index eb548e57b..be275b745 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -33,13 +33,13 @@ services:
       - registry-data:/registry
       - certs-data:/certs
     environment:
-      - REGISTRY_LOG_LEVEL=${REGISTRY_LOG_LEVEL:-info}
-      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=${REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY:-/registry}
+      - REGISTRY_LOG_LEVEL=info
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
       - REGISTRY_AUTH_TOKEN_REALM=https://${GITLAB_HOST?Variable not set}/jwt/auth
-      - REGISTRY_AUTH_TOKEN_SERVICE=${REGISTRY_AUTH_TOKEN_SERVICE:-container_registry}
-      - REGISTRY_AUTH_TOKEN_ISSUER=${REGISTRY_AUTH_TOKEN_ISSUER:-gitlab-issuer}
-      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=${REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE:-/certs/registry.crt}
-      - REGISTRY_STORAGE_DELETE_ENABLED=${REGISTRY_STORAGE_DELETE_ENABLED:-true}
+      - REGISTRY_AUTH_TOKEN_SERVICE=container_registry
+      - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
+      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
+      - REGISTRY_STORAGE_DELETE_ENABLED=true
     deploy:
       placement:
         constraints:
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.0.0
+    image: sameersbn/gitlab:13.0.0x
     depends_on:
     - redis
     - postgresql
@@ -84,134 +84,134 @@ services:
     environment:
     - DEBUG=false
 
-    - GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-true}
+    - GITLAB_REGISTRY_ENABLED=true
     - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
-    - GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
-    - GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://registry:5000}
-    - GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-/certs/registry.key}
-    - GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
-    - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-true}
+    - GITLAB_REGISTRY_PORT=443
+    - GITLAB_REGISTRY_API_URL=http://registry:5000
+    - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
+    - GITLAB_REGISTRY_ISSUER=gitlab-issuer
+    - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
 
-    - GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-false}
+    - GITLAB_SIGNUP_ENABLED=false
 
-    - DB_ADAPTER=${DB_ADAPTER:-postgresql}
-    - DB_HOST=${DB_HOST:-postgresql}
-    - DB_PORT=${DB_PORT:-5432}
-    - DB_USER=${DB_USER:-gitlab}
-    - DB_PASS=${DB_PASS:-password}
-    - DB_NAME=${DB_NAME:-gitlabhq_production}
+    - DB_ADAPTER=postgresql
+    - DB_HOST=postgresql
+    - DB_PORT=5432
+    - DB_USER=gitlab
+    - DB_PASS=password
+    - DB_NAME=gitlabhq_production
 
-    - REDIS_HOST=${REDIS_HOST:-redis}
-    - REDIS_PORT=${REDIS_PORT:-6379}
+    - REDIS_HOST=redis
+    - REDIS_PORT=6379
 
-    - TZ=${TZ:-Asia/Kolkata}
-    - GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-Kolkata}
+    - TZ=Asia/Kolkata
+    - GITLAB_TIMEZONE=Kolkata
 
-    - GITLAB_HTTPS=${GITLAB_HTTPS:-true}
-    - SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}
+    - GITLAB_HTTPS=true
+    - SSL_SELF_SIGNED=false
 
     - GITLAB_HOST=${GITLAB_HOST?Variable not set}
-    - GITLAB_PORT=${GITLAB_PORT:-443}
-    - GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
-    - GITLAB_RELATIVE_URL_ROOT=${GITLAB_RELATIVE_URL_ROOT}
-    - GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE?Variable not set}
-    - GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE?Variable not set}
-    - GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE?Variable not set}
-
-    - GITLAB_ROOT_PASSWORD=${GITLAB_ROOT_PASSWORD?Variable not set}
-    - GITLAB_ROOT_EMAIL=${GITLAB_ROOT_EMAIL?Variable not set}
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
-    - GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
-
-    - GITLAB_EMAIL=${GITLAB_EMAIL:?Variable not set}
-    - GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO?Variable not set}
-    - GITLAB_INCOMING_EMAIL_ADDRESS=${GITLAB_INCOMING_EMAIL_ADDRESS?Variable not set}
-
-    - GITLAB_BACKUP_SCHEDULE=${GITLAB_BACKUP_SCHEDULE:-daily}
-    - GITLAB_BACKUP_TIME=${GITLAB_BACKUP_TIME:-01:00}
-
-    - SMTP_ENABLED=${SMTP_ENABLED:-false}
-    - SMTP_DOMAIN=${SMTP_DOMAIN:-www.example.com}
-    - SMTP_HOST=${SMTP_HOST:-smtp.gmail.com}
-    - SMTP_PORT=${SMTP_PORT:-587}
-    - SMTP_USER=${SMTP_USER:-mailer@example.com}
-    - SMTP_PASS=${SMTP_PASS:-password}
-    - SMTP_STARTTLS=${SMTP_STARTTLS:-true}
-    - SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION:-login}
-
-    - IMAP_ENABLED=${IMAP_ENABLED:-false}
-    - IMAP_HOST=${IMAP_HOST:-imap.gmail.com}
-    - IMAP_PORT=${IMAP_PORT:-993}
-    - IMAP_USER=${IMAP_USER:-mailer@example.com}
-    - IMAP_PASS=${IMAP_PASS:-password}
-    - IMAP_SSL=${IMAP_SSL:-true}
-    - IMAP_STARTTLS=${IMAP_STARTTLS:-false}
-
-    - OAUTH_ENABLED=${OAUTH_ENABLED:-false}
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER}
-    - OAUTH_ALLOW_SSO=${OAUTH_ALLOW_SSO}
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true}
-    - OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
-    - OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false}
-    - OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS}
-
-    - OAUTH_CAS3_LABEL=${OAUTH_CAS3_LABEL:-cas3}
-    - OAUTH_CAS3_SERVER=${OAUTH_CAS3_SERVER}
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=${OAUTH_CAS3_DISABLE_SSL_VERIFICATION:-false}
-    - OAUTH_CAS3_LOGIN_URL=${OAUTH_CAS3_LOGIN_URL:-/cas/login}
-    - OAUTH_CAS3_VALIDATE_URL=${OAUTH_CAS3_VALIDATE_URL:-/cas/p3/serviceValidate}
-    - OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout}
-
-    - OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY}
-    - OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=${OAUTH_GOOGLE_RESTRICT_DOMAIN}
-
-    - OAUTH_FACEBOOK_API_KEY=${OAUTH_FACEBOOK_API_KEY}
-    - OAUTH_FACEBOOK_APP_SECRET=${OAUTH_FACEBOOK_APP_SECRET}
-
-    - OAUTH_TWITTER_API_KEY=${OAUTH_TWITTER_API_KEY}
-    - OAUTH_TWITTER_APP_SECRET=${OAUTH_TWITTER_APP_SECRET}
-
-    - OAUTH_GITHUB_API_KEY=${OAUTH_GITHUB_API_KEY}
-    - OAUTH_GITHUB_APP_SECRET=${OAUTH_GITHUB_APP_SECRET}
-    - OAUTH_GITHUB_URL=${OAUTH_GITHUB_URL}
-    - OAUTH_GITHUB_VERIFY_SSL=${OAUTH_GITHUB_VERIFY_SSL}
-
-    - OAUTH_GITLAB_API_KEY=${OAUTH_GITLAB_API_KEY}
-    - OAUTH_GITLAB_APP_SECRET=${OAUTH_GITLAB_APP_SECRET}
-
-    - OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY}
-    - OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET}
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=${OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL}
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=${OAUTH_SAML_IDP_CERT_FINGERPRINT}
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=${OAUTH_SAML_IDP_SSO_TARGET_URL}
-    - OAUTH_SAML_ISSUER=${OAUTH_SAML_ISSUER}
-    - OAUTH_SAML_LABEL=${OAUTH_SAML_LABEL:-"Our SAML Provider"}
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=${OAUTH_SAML_NAME_IDENTIFIER_FORMAT:-urn:oasis:names:tc:SAML:2.0:nameid-format:transient}
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=${OAUTH_SAML_GROUPS_ATTRIBUTE}
-    - OAUTH_SAML_EXTERNAL_GROUPS=${OAUTH_SAML_EXTERNAL_GROUPS}
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL}
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME}
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME}
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME}
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME}
-
-    - OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL}
-    - OAUTH_CROWD_APP_NAME=${OAUTH_CROWD_APP_NAME}
-    - OAUTH_CROWD_APP_PASSWORD=${OAUTH_CROWD_APP_PASSWORD}
-
-    - OAUTH_AUTH0_CLIENT_ID=${OAUTH_AUTH0_CLIENT_ID}
-    - OAUTH_AUTH0_CLIENT_SECRET=${OAUTH_AUTH0_CLIENT_SECRET}
-    - OAUTH_AUTH0_DOMAIN=${OAUTH_AUTH0_DOMAIN}
-    - OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE}
-
-    - OAUTH_AZURE_API_KEY=${OAUTH_AZURE_API_KEY}
-    - OAUTH_AZURE_API_SECRET=${OAUTH_AZURE_API_SECRET}
-    - OAUTH_AZURE_TENANT_ID=${OAUTH_AZURE_TENANT_ID}
-
-    - RACK_ATTACK_ENABLED=${RACK_ATTACK_ENABLED:-false}
+    - GITLAB_PORT=443
+    - GITLAB_SSH_PORT=22
+    - GITLAB_RELATIVE_URL_ROOT=
+    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+
+    - GITLAB_ROOT_PASSWORD=
+    - GITLAB_ROOT_EMAIL=
+
+    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+    - GITLAB_NOTIFY_PUSHER=false
+
+    - GITLAB_EMAIL=notifications@example.com
+    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+    - GITLAB_BACKUP_SCHEDULE=daily
+    - GITLAB_BACKUP_TIME=01:00
+
+    - SMTP_ENABLED=false
+    - SMTP_DOMAIN=www.example.com
+    - SMTP_HOST=smtp.gmail.com
+    - SMTP_PORT=587
+    - SMTP_USER=mailer@example.com
+    - SMTP_PASS=password
+    - SMTP_STARTTLS=true
+    - SMTP_AUTHENTICATION=login
+
+    - IMAP_ENABLED=false
+    - IMAP_HOST=imap.gmail.com
+    - IMAP_PORT=993
+    - IMAP_USER=mailer@example.com
+    - IMAP_PASS=password
+    - IMAP_SSL=true
+    - IMAP_STARTTLS=false
+
+    - OAUTH_ENABLED=false
+    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+    - OAUTH_ALLOW_SSO=
+    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+    - OAUTH_AUTO_LINK_LDAP_USER=false
+    - OAUTH_AUTO_LINK_SAML_USER=false
+    - OAUTH_EXTERNAL_PROVIDERS=
+
+    - OAUTH_CAS3_LABEL=cas3
+    - OAUTH_CAS3_SERVER=
+    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+    - OAUTH_CAS3_LOGIN_URL=/cas/login
+    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+    - OAUTH_GOOGLE_API_KEY=
+    - OAUTH_GOOGLE_APP_SECRET=
+    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+    - OAUTH_FACEBOOK_API_KEY=
+    - OAUTH_FACEBOOK_APP_SECRET=
+
+    - OAUTH_TWITTER_API_KEY=
+    - OAUTH_TWITTER_APP_SECRET=
+
+    - OAUTH_GITHUB_API_KEY=
+    - OAUTH_GITHUB_APP_SECRET=
+    - OAUTH_GITHUB_URL=
+    - OAUTH_GITHUB_VERIFY_SSL=
+
+    - OAUTH_GITLAB_API_KEY=
+    - OAUTH_GITLAB_APP_SECRET=
+
+    - OAUTH_BITBUCKET_API_KEY=
+    - OAUTH_BITBUCKET_APP_SECRET=
+
+    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+    - OAUTH_SAML_IDP_SSO_TARGET_URL=
+    - OAUTH_SAML_ISSUER=
+    - OAUTH_SAML_LABEL="Our SAML Provider"
+    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+    - OAUTH_SAML_GROUPS_ATTRIBUTE=
+    - OAUTH_SAML_EXTERNAL_GROUPS=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+    - OAUTH_CROWD_SERVER_URL=
+    - OAUTH_CROWD_APP_NAME=
+    - OAUTH_CROWD_APP_PASSWORD=
+
+    - OAUTH_AUTH0_CLIENT_ID=
+    - OAUTH_AUTH0_CLIENT_SECRET=
+    - OAUTH_AUTH0_DOMAIN=
+    - OAUTH_AUTH0_SCOPE=
+
+    - OAUTH_AZURE_API_KEY=
+    - OAUTH_AZURE_API_SECRET=
+    - OAUTH_AZURE_TENANT_ID=
+
+    - RACK_ATTACK_ENABLED=false
     deploy:
       placement:
         constraints:
@@ -220,14 +220,14 @@ services:
         - traefik.enable=true
         - traefik.docker.network=traefik-public
         - traefik.constraint-label=traefik-public
-        - traefik.http.routers.gitlab-registry-http.rule=Host(`${GITLAB_HOST?Variable not set}`)
-        - traefik.http.routers.gitlab-registry-http.entrypoints=http
-        - traefik.http.routers.gitlab-registry-http.middlewares=https-redirect
-        - traefik.http.routers.gitlab-registry-https.rule=Host(`${GITLAB_HOST?Variable not set}`)
-        - traefik.http.routers.gitlab-registry-https.entrypoints=https
-        - traefik.http.routers.gitlab-registry-https.tls=true
-        - traefik.http.routers.gitlab-registry-https.tls.certresolver=le
-        - traefik.http.services.gitlab-registry.loadbalancer.server.port=8181
+        - traefik.http.routers.gitlab-gitlab-http.rule=Host(`${GITLAB_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-gitlab-http.entrypoints=http
+        - traefik.http.routers.gitlab-gitlab-http.middlewares=https-redirect
+        - traefik.http.routers.gitlab-gitlab-https.rule=Host(`${GITLAB_HOST?Variable not set}`)
+        - traefik.http.routers.gitlab-gitlab-https.entrypoints=https
+        - traefik.http.routers.gitlab-gitlab-https.tls=true
+        - traefik.http.routers.gitlab-gitlab-https.tls.certresolver=le
+        - traefik.http.services.gitlab-gitlab.loadbalancer.server.port=80
 
 volumes:
   redis-data:

From 4fa6497478eff971da83880b812a0f526ab5a97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 26 May 2020 19:53:12 +0200
Subject: [PATCH 0500/1124] =?UTF-8?q?=F0=9F=90=9B=20Fix=20debugging=20fake?=
 =?UTF-8?q?=20image?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index be275b745..9feaca143 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.0.0x
+    image: sameersbn/gitlab:13.0.0
     depends_on:
     - redis
     - postgresql

From b3eacbdd9d45c534abc216b3947e5ecc866295fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 26 May 2020 19:54:07 +0200
Subject: [PATCH 0501/1124] =?UTF-8?q?=F0=9F=90=9B=20Fix=20running=20genera?=
 =?UTF-8?q?te=5Fregistry=5Fcertificates=20by=20default=20and=20returning?=
 =?UTF-8?q?=20to=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/runtime/functions | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index ee1d3f95d..449acd321 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1651,6 +1651,7 @@ configure_gitlab() {
   gitlab_configure_cron_jobs
   gitlab_configure_analytics
   gitlab_configure_backups
+  generate_registry_certificates
   gitlab_configure_registry
   gitlab_configure_pages
   gitlab_configure_sentry
@@ -1867,6 +1868,7 @@ execute_raketask() {
 generate_registry_certificates() {
   if [[ ${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES} == true ]]; then
     echo 'Generating GitLab Registry internal certificates for communication between Gitlab and a Docker Registry'
+    PREVIOUS_DIRECTORY=$(pwd)
     # Get directory from cert file path
     if [[ -z $GITLAB_REGISTRY_KEY_PATH ]]; then
         echo "\$GITLAB_REGISTRY_KEY_PATH is empty"
@@ -1912,5 +1914,7 @@ generate_registry_certificates() {
     else
         openssl x509 -in registry.csr -out "$CERT_FILENAME" -req -signkey "$KEY_FILENAME" -days 10000
     fi
+    chown -R ${GITLAB_USER}: ${DIRECTORY}
+    cd ${PREVIOUS_DIRECTORY}
   fi
 }

From bbcb3842c44a66d95406eb03000fd88fbdc2ebae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 26 May 2020 20:15:27 +0200
Subject: [PATCH 0502/1124] =?UTF-8?q?=F0=9F=93=9D=20Update=20Docker=20Swar?=
 =?UTF-8?q?m=20guide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/docker-swarm-traefik-registry.md | 76 +++++++--------------------
 1 file changed, 20 insertions(+), 56 deletions(-)

diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md
index d3ccfb601..cf6f479dc 100644
--- a/docs/docker-swarm-traefik-registry.md
+++ b/docs/docker-swarm-traefik-registry.md
@@ -100,7 +100,7 @@ export GITLAB_HOST=gitlab.example.com
 export REGISTRY_HOST=registry.example.com
 ```
 
-You will use the domain for `GITLAB_HOST` to access GitLab in your browser and to commit with Git.
+You will use the domain for `GITLAB_HOST` to access GitLab in your browser and to commit and push with Git.
 
 And you will use the domain for `REGISTRY_HOST` to store, push, and pull Docker images, e.g.:
 
@@ -110,7 +110,7 @@ docker pull registry.example.com/mygroup/myproject/imagename:sometag
 
 These environment variables will be used by the file `docker-compose.swarm.yml`.
 
-They are used inside of the stacks and are also used to configure the domains for the Traefik load balancer. Because of that, you need to export them.
+They are used inside of the stacks and are also used to configure the domains for the Traefik load balancer. Because of that, you need to export them for them to be available when deploying the stack.
 
 ## Other environment variables
 
@@ -120,16 +120,14 @@ Read the [main README](https://github.com/sameersbn/docker-gitlab) for all the o
 
 For Registry specific options and details, check the main [GitLab Registry documentation in this repo](https://github.com/sameersbn/docker-gitlab/blob/master/docs/container_registry.md).
 
-You can configure them by exporting the environment variables you want to use like you did for `GITLAB_HOST` and `REGISTRY_HOST`, or you can also edit de file `docker-compose.swarm.yml` directly.
+You can configure them by editing de file `docker-compose.swarm.yml`.
 
-If you want to edit the file directly, you can do it in the command line with a program like `nano`, e.g.:
+You can do it in the command line with a program like `nano`, e.g.:
 
 ```bash
 nano docker-compose.swarm.yml
 ```
 
-You could want to edit the file directly to preserve the values that you used for deploying your stack.
-
 ## Set other environment variables
 
 If you want anyone to sign up instead of only people with invitation, change `GITLAB_SIGNUP_ENABLED` to `true`:
@@ -155,43 +153,7 @@ You can copy it and set it in the file like:
 - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
 ```
 
-Or you can do it by exporting variables like:
-
-```bash
-export GITLAB_SECRETS_DB_KEY_BASE=$(openssl rand -hex 32)
-export GITLAB_SECRETS_SECRET_KEY_BASE=$(openssl rand -hex 32)
-export GITLAB_SECRETS_OTP_KEY_BASE=$(openssl rand -hex 32)
-```
-
-that will assign a new random string to each environment variable.
-
-* Set `GITLAB_ROOT_PASSWORD` to the key of the main first administrator user:
-
-```bash
-export GITLAB_ROOT_PASSWORD=change-this-admin-password
-```
-
-* Set `GITLAB_ROOT_EMAIL` to the email of the main first administrator user:
-
-```bash
-export GITLAB_ROOT_EMAIL=admin@example.com
-```
-
-...by default `admin@${GITLAB_HOST}`.
-
-* Set the appropriate email accounts for the following variables:
-
-```bash
-export GITLAB_EMAIL=notifications@git.example.com
-export GITLAB_EMAIL_REPLY_TO=noreply@git.example.com
-export GITLAB_INCOMING_EMAIL_ADDRESS=reply@git.example.com
-```
-
-...by default:
-
-* `GITLAB_EMAIL`: `notifications@${GITLAB_HOST}`
-* `GITLAB_EMAIL_REPLY_TO`: `noreply@${GITLAB_HOST}`
-* `GITLAB_INCOMING_EMAIL_ADDRESS`: `reply@${GITLAB_HOST}`
+There are several other settings that you might want to configure, like email accounts for notifications, SMTP credentials to send emails, etc.
 
 ## Copy the file
 
@@ -207,15 +169,13 @@ and connect via SSH to your remote server, e.g.:
 ssh -p 2222 root@gitlab.example.com
 ```
 
-If you modified the file locally and then connected to your server later, make sure you export any missing environment variables.
-
-Specially `GITLAB_HOST` and `REGISTRY_HOST` that are needed as env vars even if you modified the Docker Compose file (as those are used in the Traefik labels).
+If you modified the file locally and then connected to your server later, make sure you export the environment variables `GITLAB_HOST` and `REGISTRY_HOST` that are needed even if you modified the Docker Compose file (as those are used in the Traefik labels).
 
 ## About volumes, labels, and constraints
 
 Because the Docker Swarm cluster may have more than one single node (machine) in the cluster, we need to make sure that the services that need to save and read files from volumes are always deployed to the same node.
 
-For example, the service for `redis` uses a volume, you can check it on the file:
+For example, the service for `redis` uses a volume, you can check it on the `docker-compose.swarm.yml` file:
 
 ```yaml
     volumes:
@@ -233,7 +193,7 @@ To make sure `redis` is always deployed to the same node that contains the same
 
 This tells Docker that the service `redis` should be deployed to a Docker node (a machine in the cluster) with the label `node.labels.gitlab.redis-data=true`.
 
-Then we can make one node have this label, and Docker Swarm will always deploy the `redis` service to the same node.
+Then we can make one node (only one) have this label, and Docker Swarm will always deploy the `redis` service to the same node. That way, the service will keep reading the same volume every time. Even if you re-deploy or upgrade the stack.
 
 ## Add constraint labels
 
@@ -258,15 +218,15 @@ m48gz5e8ucmk59af4m6enmnaz *   dog.example.com      Ready    Active         Leade
 mue36qqwqnzrqt4iqi0yyd6ie     gitlab.example.com   Ready    Active                          19.03.9
 ```
 
-And select the node where you want to deploy the main `gitlab` service. In this example, in the `HOSTNAME` `gitlab.example.com`, with node ID `mue36qqwqnzrqt4iqi0yyd6ie`.
+And select the node where you want to deploy the main `gitlab` service. In this example, in the node that has a `HOSTNAME` with value `gitlab.example.com`, with node ID `mue36qqwqnzrqt4iqi0yyd6ie`.
 
-So, you could export that environment variable with that node with:
+So, you could export that environment variable using the node ID with something like:
 
 ```bash
 export NODE_ID=mue36qqwqnzrqt4iqi0yyd6ie
 ```
 
-* Create a tag in that node, so that the service `gitlab` and `registry` are always deployed to the same node and use the same volumes:
+* Create a label in that node, so that the service `gitlab` and `registry` are always deployed to the same node and use the same volumes:
 
 ```bash
 docker node update --label-add gitlab.certs-data=true $NODE_ID
@@ -286,6 +246,8 @@ And add the label for `postgres`:
 docker node update --label-add gitlab.postgresql-data=true $NODE_ID
 ```
 
+**Note**: you only have to set those labels once. Not every time you want to re-deploy your stack.
+
 ## Deploy the stack
 
 Now, having the labels set in the Docker nodes, and the environment variables exported, you can deploy your stack:
@@ -294,6 +256,8 @@ Now, having the labels set in the Docker nodes, and the environment variables ex
 docker stack deploy --compose-file docker-compose.swarm.yml gitlab
 ```
 
+**Note**: the environment variables `GITLAB_HOST` and `REGISTRY_HOST` have to be available every time to deploy the stack. But the node labels can be set only once, the first time you deploy.
+
 You can check the status of the deployment with:
 
 ```bash
@@ -350,13 +314,13 @@ And the Registry is configured to look for the certificate in that same location
 
 If you use GitLab and want to integrate Continuous Integration / Continuous Deployment, you can follow this section to install the GitLab runner.
 
-You should create the runner using Docker standalone instead of in Docker Swarm mode, as you need the configurations to persist, and in Docker Swarm mode, the container could be deployed to a different server and you would loose those configurations.
+You should create the runner using Docker standalone instead of in Docker Swarm mode, as you need the configurations to persist, and in Docker Swarm mode, the container could be deployed to a different server and you would lose those configurations.
 
 ### Testing and Deployment
 
 For testing, the GitLab runner can run in any node.
 
-But if you want to deploy another runner (or the same) for deployment in the same Docker Swarm cluster, it has to run on a manager node.
+But if you want to deploy another runner for deployment (or use the same one), it has to run on a manager node in the Docker Swarm cluster.
 
 ### Create the GitLab Runner in Docker standalone mode
 
@@ -380,19 +344,19 @@ docker exec -it gitlab-runner bash
 ### Install the GitLab Runner
 
 * Go to the GitLab "Admin Area -> Runners" section.
-* Get the URL and create a variable in your Docker Manager's Terminal, e.g.:
+* Get the URL and create a variable with it in the bash session inside of your Runner's Docker container, e.g.:
 
 ```bash
 export GITLAB_URL=https://gitlab.example.com/
 ```
 
-* Get the registration token and create a variable in your Docker Manager's Terminal, e.g.:
+* Get the registration token and create a variable in the bash session inside of your Runner's Docker container, e.g.:
 
 ```bash
 export GITLAB_TOKEN=WYasdfJp4sdfasdf1234
 ```
 
-* Run the next command editing the name and tags as you need, you can also edit the tags later in the web user interface.
+* Run the next command editing the name and tags as you need, you can also edit them later in the web user interface.
 
 ```bash
 gitlab-runner \

From 3537d5444583d34f4d640a8f6d0ad973f9394912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 26 May 2020 20:19:56 +0200
Subject: [PATCH 0503/1124] =?UTF-8?q?=F0=9F=94=A7=20Apply=20healthcheck=20?=
 =?UTF-8?q?from=20main=20Docker=20Compose=20to=20Docker=20Compose=20for=20?=
 =?UTF-8?q?Docker=20Swarm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9feaca143..3d81cf401 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -76,6 +76,12 @@ services:
     volumes:
     - gitlab-data:/home/git/data:Z
     - certs-data:/certs
+    healthcheck:
+      test: ["CMD", "/usr/local/sbin/healthcheck"]
+      interval: 5m
+      timeout: 10s
+      retries: 3
+      start_period: 5m
     networks:
       # To communicate with other services in this stack
       - default

From c250de7579d8b84e8b678a2276233fc9d317d8e0 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 27 May 2020 10:15:41 +0530
Subject: [PATCH 0504/1124] use the latest (12) postgresql-client libraries

Refer #2160
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a2d3baaa3..7a3a7af44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ RUN set -ex && \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server postgresql-client-11 postgresql-contrib-11 redis-tools \
+      nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \
       git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm5 libreadline7 libncurses5 libffi6 \

From 31325c1007dbd18e7c70ad7e377193c740ca5fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Wed, 27 May 2020 16:34:58 +0200
Subject: [PATCH 0505/1124] fix: healthcheck and GITLAB_HTTPS=true

Follow redirects
Allow connections to SSL sites without certs
---
 assets/build/install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 9127178bb..a29dfd437 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -431,8 +431,9 @@ EOF
 cat > /usr/local/sbin/healthcheck <<EOF
 #!/bin/bash
 url=http://localhost/-/liveness
-curl -s \$url
-[[ "\$(curl -s -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
+options=( '--insecure' '--location' '--silent' )
+curl "\${options[@]}" \$url
+[[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
 EOF
 chmod +x /usr/local/sbin/healthcheck
 

From bf0e337a2194ba7c287b2ac998ee344cd6bda66d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 27 May 2020 21:06:33 +0200
Subject: [PATCH 0506/1124] Upgrade GitLab CE to 13.0.1

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1859bd9e7..4f5add70c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.1**
+- gitlab: upgrade CE to v13.0.1
+
 **13.0.0**
 - gitlab: upgrade CE to v13.0.0
 
diff --git a/Dockerfile b/Dockerfile
index 7a3a7af44..f247c44f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.0
+ARG VERSION=13.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.0 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.0 \
+    GITALY_SERVER_VERSION=13.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0c3841fff..85e7ad3e7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.0
+# sameersbn/gitlab:13.0.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.0
+docker pull sameersbn/gitlab:13.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.0
+ sameersbn/gitlab:13.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.0
+    sameersbn/gitlab:13.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:sanitize
+    sameersbn/gitlab:13.0.1 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake db:setup
+    sameersbn/gitlab:13.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,7 +1178,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.0
+docker pull sameersbn/gitlab:13.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.1
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 02161ca86..5cb7d8566 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.0
+13.0.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 3089c867e..5868243ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.0
+    image: sameersbn/gitlab:13.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 419a3b515..9c39d1962 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.0
+docker pull sameersbn/gitlab:13.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.0
+sameersbn/gitlab:13.0.1
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 048684491..844426629 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.0
+        image: sameersbn/gitlab:13.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 3eb31c30a6e436f86dcaf5951212189892248e78 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Wed, 27 May 2020 21:06:48 +0200
Subject: [PATCH 0507/1124] Update gitlab-workhorse to 8.31.1

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f247c44f4..e8b83e72a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=13.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.31.0 \
+    GITLAB_WORKHORSE_VERSION=8.31.1 \
     GITLAB_PAGES_VERSION=1.18.0 \
     GITALY_SERVER_VERSION=13.0.1 \
     GITLAB_USER="git" \

From dcdcc8a9bfe87a25fbb1a79de61423dd1afb5cd6 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 29 May 2020 04:41:01 +0200
Subject: [PATCH 0508/1124] Upgrade GitLab CE to 13.0.2

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4f5add70c..9e1763bb7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.2**
+- gitlab: upgrade CE to v13.0.2
+
 **13.0.1**
 - gitlab: upgrade CE to v13.0.1
 
diff --git a/Dockerfile b/Dockerfile
index e8b83e72a..04e97f247 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.1
+ARG VERSION=13.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.1 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.1 \
+    GITALY_SERVER_VERSION=13.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 85e7ad3e7..95a87fd6e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.1
+# sameersbn/gitlab:13.0.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.1
+docker pull sameersbn/gitlab:13.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.1
+ sameersbn/gitlab:13.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.1
+    sameersbn/gitlab:13.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:sanitize
+    sameersbn/gitlab:13.0.2 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake db:setup
+    sameersbn/gitlab:13.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,7 +1178,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.1
+docker pull sameersbn/gitlab:13.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.2
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 5cb7d8566..347caf39f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.1
+13.0.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 5868243ac..315b406bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.1
+    image: sameersbn/gitlab:13.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9c39d1962..da895ad4a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.1
+docker pull sameersbn/gitlab:13.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.1
+sameersbn/gitlab:13.0.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 844426629..cde9687a8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.1
+        image: sameersbn/gitlab:13.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 7bfbb71d37f354c89ec024b06518598913f28dab Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 29 May 2020 12:47:06 +0200
Subject: [PATCH 0509/1124] Upgrade GitLab CE to 13.0.3

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9e1763bb7..f3e7aeb6d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.3**
+- gitlab: upgrade CE to v13.0.3
+
 **13.0.2**
 - gitlab: upgrade CE to v13.0.2
 
diff --git a/Dockerfile b/Dockerfile
index 04e97f247..3793be326 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.2
+ARG VERSION=13.0.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.1 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.2 \
+    GITALY_SERVER_VERSION=13.0.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 95a87fd6e..f1966729b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.2
+# sameersbn/gitlab:13.0.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.2
+docker pull sameersbn/gitlab:13.0.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.2
+ sameersbn/gitlab:13.0.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.2
+    sameersbn/gitlab:13.0.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:sanitize
+    sameersbn/gitlab:13.0.3 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake db:setup
+    sameersbn/gitlab:13.0.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,7 +1178,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.2
+docker pull sameersbn/gitlab:13.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.3
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 347caf39f..2cb4f2f63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.2
+13.0.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 315b406bc..100cdf71b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.2
+    image: sameersbn/gitlab:13.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index da895ad4a..e0b252f02 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.2
+docker pull sameersbn/gitlab:13.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.2
+sameersbn/gitlab:13.0.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index cde9687a8..719934820 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.2
+        image: sameersbn/gitlab:13.0.3
         env:
         - name: TZ
           value: Asia/Kolkata

From d4df3f312bde3602ea27f38aed77fea261c7be2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Thu, 28 May 2020 08:43:48 +0200
Subject: [PATCH 0510/1124] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20Docker?=
 =?UTF-8?q?=20Compose=20version=20to=203.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 3d81cf401..dfc437b7d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.4'
 services:
   redis:
     image: redis:5.0.9

From 9b612b8a0771bfaa8113f00ec40b32609d348ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Thu, 28 May 2020 08:44:53 +0200
Subject: [PATCH 0511/1124] =?UTF-8?q?=F0=9F=94=A5=20Remove=20healthcheck?=
 =?UTF-8?q?=20until=20it=20is=20built=20into=20the=20image=20and=20can=20b?=
 =?UTF-8?q?e=20tested?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.swarm.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index dfc437b7d..6b112621b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -76,12 +76,12 @@ services:
     volumes:
     - gitlab-data:/home/git/data:Z
     - certs-data:/certs
-    healthcheck:
-      test: ["CMD", "/usr/local/sbin/healthcheck"]
-      interval: 5m
-      timeout: 10s
-      retries: 3
-      start_period: 5m
+    # healthcheck:
+    #   test: ["CMD", "/usr/local/sbin/healthcheck"]
+    #   interval: 5m
+    #   timeout: 10s
+    #   retries: 3
+    #   start_period: 5m
     networks:
       # To communicate with other services in this stack
       - default

From e2d7d726f5530d5d0343cd0ef985e762a47513f3 Mon Sep 17 00:00:00 2001
From: orvice <orvice@gmail.com>
Date: Mon, 1 Jun 2020 02:04:16 +0800
Subject: [PATCH 0512/1124] add  artifacts:direct_upload  back

that was removed at: https://github.com/sameersbn/docker-gitlab/commit/9ec381b3ef46bcca6b693330c6c97d8854521f3d#diff-c23ee6433bb041af815df0457df129d0L175
---
 assets/runtime/config/gitlabhq/gitlab.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 7f9b61401..4f549a037 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -219,6 +219,7 @@ production: &base
     object_store:
       enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
+      direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
       background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:

From 31a37d2569a01c0c5a8804d4a1d4734c50ebfa9b Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 5 Jun 2020 18:24:04 +0200
Subject: [PATCH 0513/1124] Upgrade GitLab CE to 13.0.5

---
 Changelog.md               |  3 +++
 Dockerfile                 |  4 +--
 README.md                  | 52 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 ++++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f3e7aeb6d..c928d4fc5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.5**
+- gitlab: upgrade CE to v13.0.5
+
 **13.0.3**
 - gitlab: upgrade CE to v13.0.3
 
diff --git a/Dockerfile b/Dockerfile
index 3793be326..fa9bd7879 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.3
+ARG VERSION=13.0.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.1 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.3 \
+    GITALY_SERVER_VERSION=13.0.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f1966729b..1ce7f14a5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.3
+# sameersbn/gitlab:13.0.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.3
+docker pull sameersbn/gitlab:13.0.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.3
+ sameersbn/gitlab:13.0.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.3
+    sameersbn/gitlab:13.0.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:sanitize
+    sameersbn/gitlab:13.0.5 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake db:setup
+    sameersbn/gitlab:13.0.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,7 +1178,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.3
+docker pull sameersbn/gitlab:13.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.5
 ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 2cb4f2f63..f64807a17 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.3
+13.0.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 100cdf71b..45ae6a9c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.3
+    image: sameersbn/gitlab:13.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e0b252f02..53f2e0022 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.3
+docker pull sameersbn/gitlab:13.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.3
+sameersbn/gitlab:13.0.5
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 719934820..ceabbc5eb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.3
+        image: sameersbn/gitlab:13.0.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 34c2d5714eeb5b513dbbf80bbcc34211300dc77e Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 5 Jun 2020 18:24:17 +0200
Subject: [PATCH 0514/1124] Update gitlab-workhorse to 8.31.2

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fa9bd7879..d3fed4ceb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.10 \
     GITLAB_SHELL_VERSION=13.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.31.1 \
+    GITLAB_WORKHORSE_VERSION=8.31.2 \
     GITLAB_PAGES_VERSION=1.18.0 \
     GITALY_SERVER_VERSION=13.0.5 \
     GITLAB_USER="git" \

From 36e6bacce690ac6093ef53eb3f4a929322327fe0 Mon Sep 17 00:00:00 2001
From: f-io <lasse@fioaudio.com>
Date: Sat, 13 Jun 2020 12:59:57 +0200
Subject: [PATCH 0515/1124] Upgrade GitLab CE to 13.0.6 (#2175)

* Update docker-compose.yml

Upgrade GitLab CE to 13.0.6

* Update GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

changed postgres version.

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

* Upgrade GitLab CE to 13.0.6

postgresql 11
---
 Changelog.md               |  3 ++
 Dockerfile                 |  4 +--
 README.md                  | 62 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++---
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c928d4fc5..6903f3129 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.6**
+- gitlab: upgrade CE to v13.0.6
+
 **13.0.5**
 - gitlab: upgrade CE to v13.0.5
 
diff --git a/Dockerfile b/Dockerfile
index d3fed4ceb..cc9d9c600 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.5
+ARG VERSION=13.0.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.2 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.5 \
+    GITALY_SERVER_VERSION=13.0.6 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1ce7f14a5..bb58de797 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.5
+# sameersbn/gitlab:13.0.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.5
+docker pull sameersbn/gitlab:13.0.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -171,7 +171,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:10-2
+    sameersbn/postgresql:11-20200524
 ```
 
 Step 2. Launch a redis container
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -275,7 +275,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, lets pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:10-2
+docker pull sameersbn/postgresql:11-20200524
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -295,7 +295,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:10-2
+    sameersbn/postgresql:11-20200524
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.5
+ sameersbn/gitlab:13.0.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.5
+    sameersbn/gitlab:13.0.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:sanitize
+    sameersbn/gitlab:13.0.6 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake db:setup
+    sameersbn/gitlab:13.0.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.5
+docker pull sameersbn/gitlab:13.0.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.6
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:12.7.7
+    image: sameersbn/gitlab:13.0.6
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f64807a17..6fe535b5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.5
+13.0.6
diff --git a/docker-compose.yml b/docker-compose.yml
index 45ae6a9c5..6f6d3e725 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.5
+    image: sameersbn/gitlab:13.0.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 53f2e0022..cbb7c87bb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.5
+docker pull sameersbn/gitlab:13.0.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.5
+sameersbn/gitlab:13.0.6
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ceabbc5eb..c655a4ef7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.5
+        image: sameersbn/gitlab:13.0.6
         env:
         - name: TZ
           value: Asia/Kolkata

From d2263980ea645a4aac3be1d27afea2df71a382ad Mon Sep 17 00:00:00 2001
From: Michal Galet <michal.galet@gmail.com>
Date: Wed, 24 Jun 2020 13:33:04 +0200
Subject: [PATCH 0516/1124] Obfuscate access_token and private_token in nginx
 access log

Authentication tokens are allowed to be part of URI and therefore they are printed
in the access log. This can be a security concern especially when system and
application logs are being send to an external logging system (syslog, wazuh,
splunk, etc.).
---
 assets/runtime/config/nginx/gitlab     | 11 ++++++++++-
 assets/runtime/config/nginx/gitlab-ssl | 13 +++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index 6372aad90..b08c8bff4 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -25,6 +25,15 @@ map $http_upgrade $connection_upgrade_gitlab {
     ''      close;
 }
 
+## Obfuscate access_token and private_token in access log
+map $request_uri $obfuscated_request_uri {
+    ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4;
+    default $request_uri;
+}
+log_format main '$remote_addr - $remote_user [$time_local] '
+                  '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent '
+                  '"$http_referer" "$http_user_agent"';
+
 ## Normal HTTP host
 server {
   ## Either remove "default_server" from the listen line below,
@@ -49,7 +58,7 @@ server {
   add_header Strict-Transport-Security "max-age={{NGINX_HSTS_MAXAGE}};";
 
   ## Individual nginx logs for this GitLab vhost
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 
   location / {
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 24acfe171..8d8d5c3a8 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -29,6 +29,15 @@ map $http_upgrade $connection_upgrade_gitlab_ssl {
     ''      close;
 }
 
+## Obfuscate access_token and private_token in access log
+map $request_uri $obfuscated_request_uri {
+    ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4;
+    default $request_uri;
+}
+log_format main '$remote_addr - $remote_user [$time_local] '
+                  '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent '
+                  '"$http_referer" "$http_user_agent"';
+
 ## Redirects all HTTP traffic to the HTTPS host
 server {
   ## Either remove "default_server" from the listen line below,
@@ -40,7 +49,7 @@ server {
   server_name _; ## Replace this with something like gitlab.example.com
   server_tokens off; ## Don't show the nginx version number, a security best practice
   return 301 https://$host:{{GITLAB_PORT}}$request_uri;
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 }
 
@@ -94,7 +103,7 @@ server {
   ssl_dhparam {{SSL_DHPARAM_PATH}};
 
   ## Individual nginx logs for this GitLab vhost
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 
   location / {

From 79fae204483332ed4b6a5872e08939462d4387ed Mon Sep 17 00:00:00 2001
From: Niclas Mietz <niclas@mietz.io>
Date: Mon, 29 Jun 2020 07:52:15 +0200
Subject: [PATCH 0517/1124] Upgrade GitLab CE to 13.0.7 (#2185)

---
 Changelog.md               |  3 ++
 Dockerfile                 |  4 +--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6903f3129..26517f158 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.0.7**
+- gitlab: upgrade CE to v13.0.7
+
 **13.0.6**
 - gitlab: upgrade CE to v13.0.6
 
diff --git a/Dockerfile b/Dockerfile
index cc9d9c600..656cfc004 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.6
+ARG VERSION=13.0.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.2 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.6 \
+    GITALY_SERVER_VERSION=13.0.7 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bb58de797..10fb45a74 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.6
+# sameersbn/gitlab:13.0.7
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.6
+docker pull sameersbn/gitlab:13.0.7
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.6
+ sameersbn/gitlab:13.0.7
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.6
+    sameersbn/gitlab:13.0.7
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:sanitize
+    sameersbn/gitlab:13.0.7 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake db:setup
+    sameersbn/gitlab:13.0.7 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.7 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:env:info
+    sameersbn/gitlab:13.0.7 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.0.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.6
+docker pull sameersbn/gitlab:13.0.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.7
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.0.6
+    image: sameersbn/gitlab:13.0.7
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6fe535b5b..4e8f3240e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.6
+13.0.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f6d3e725..6d52c2b5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.6
+    image: sameersbn/gitlab:13.0.7
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cbb7c87bb..e86972f1a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.6
+docker pull sameersbn/gitlab:13.0.7
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.6
+sameersbn/gitlab:13.0.7
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c655a4ef7..1f4de30bb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.6
+        image: sameersbn/gitlab:13.0.7
         env:
         - name: TZ
           value: Asia/Kolkata

From 80212eff1ab298a83e6dbe2294d7790934f26e6c Mon Sep 17 00:00:00 2001
From: Phi Tran <phi@manifera.com>
Date: Sun, 2 Aug 2020 22:06:45 +0700
Subject: [PATCH 0518/1124] Fix gitlab pages deamon error when enabling access
 control (#2177)

---
 assets/runtime/config/gitlab-pages/config |  5 +++++
 assets/runtime/functions                  | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 assets/runtime/config/gitlab-pages/config

diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
new file mode 100644
index 000000000..768d5f95d
--- /dev/null
+++ b/assets/runtime/config/gitlab-pages/config
@@ -0,0 +1,5 @@
+auth-client-id={{GITLAB_PAGES_ACCESS_CLIENT_ID}}
+auth-client-secret={{GITLAB_PAGES_ACCESS_CLIENT_SECRET}}
+auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
+auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
+gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 449acd321..81f4a366a 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -27,6 +27,7 @@ GITLAB_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab"
 GITLAB_CI_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab_ci"
 GITLAB_REGISTRY_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-registry"
 GITLAB_PAGES_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-pages"
+GITLAB_PAGES_CONFIG="${GITLAB_INSTALL_DIR}/gitlab-pages-config"
 GITLAB_GITALY_CONFIG="${GITLAB_GITALY_INSTALL_DIR}/config.toml"
 
 # Compares two version strings `a` and `b`
@@ -1564,6 +1565,7 @@ install_configuration_templates() {
 
   ## ${GITLAB_PAGES_NGINX_CONFIG}
   if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then
+    install_template ${GITLAB_USER}: gitlab-pages/config ${GITLAB_PAGES_CONFIG} 0640
     if [[ ${GITLAB_PAGES_HTTPS} == true && -f ${SSL_PAGES_CERT_PATH} && -f ${SSL_PAGES_KEY_PATH} ]]; then
       if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then
         install_template root: nginx/gitlab-pages-ssl ${GITLAB_PAGES_NGINX_CONFIG}
@@ -1708,12 +1710,15 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
     GITLAB_PAGES_ACCESS_SECRET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 40 ; echo '')
   fi
 
+  update_template ${GITLAB_PAGES_CONFIG} \
+      GITLAB_PAGES_ACCESS_CLIENT_ID \
+      GITLAB_PAGES_ACCESS_CLIENT_SECRET \
+      GITLAB_PAGES_ACCESS_REDIRECT_URI \
+      GITLAB_PAGES_ACCESS_SECRET \
+      GITLAB_PAGES_ACCESS_CONTROL_SERVER
+
 cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
-  -auth-server ${GITLAB_PAGES_ACCESS_CONTROL_SERVER}
-  -auth-secret ${GITLAB_PAGES_ACCESS_SECRET}
-  -auth-client-id ${GITLAB_PAGES_ACCESS_CLIENT_ID}
-  -auth-client-secret ${GITLAB_PAGES_ACCESS_CLIENT_SECRET}
-  -auth-redirect-uri ${GITLAB_PAGES_ACCESS_REDIRECT_URI}
+  -config ${GITLAB_PAGES_CONFIG}
 EOF
 fi
 

From e00d468ed21be51ecadf03a7caab153804aa40d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:06:25 +0200
Subject: [PATCH 0519/1124] upgrade golang to 14.4.6

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

diff --git a/Dockerfile b/Dockerfile
index 656cfc004..84ef8e084 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=13.0.7
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.13.10 \
+    GOLANG_VERSION=1.14.6 \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.31.2 \
     GITLAB_PAGES_VERSION=1.18.0 \

From 0d534fa7cf26ded074fcf2e6c9a44f463528cf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:07:52 +0200
Subject: [PATCH 0520/1124] upgrade gitlab-workhorse to 8.37.0

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

diff --git a/Dockerfile b/Dockerfile
index 84ef8e084..edbbcd689 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.14.6 \
     GITLAB_SHELL_VERSION=13.2.0 \
-    GITLAB_WORKHORSE_VERSION=8.31.2 \
+    GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.18.0 \
     GITALY_SERVER_VERSION=13.0.7 \
     GITLAB_USER="git" \

From 26044b82108de7a99ac4c9304b3193ec39ddc79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:08:26 +0200
Subject: [PATCH 0521/1124] upgrade gitaly to 13.2.1

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

diff --git a/Dockerfile b/Dockerfile
index edbbcd689..f166b91c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.2.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.18.0 \
-    GITALY_SERVER_VERSION=13.0.7 \
+    GITALY_SERVER_VERSION=13.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 3361659d36a4b7d2f29e3d56559583c930ce1634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:08:49 +0200
Subject: [PATCH 0522/1124] upgrade gitlab-shell to 13.4.0

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

diff --git a/Dockerfile b/Dockerfile
index f166b91c0..79fd65c5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=13.0.7
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.14.6 \
-    GITLAB_SHELL_VERSION=13.2.0 \
+    GITLAB_SHELL_VERSION=13.4.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.18.0 \
     GITALY_SERVER_VERSION=13.2.1 \

From d2629d0311a073a9f69c337f98d009ac5fb6a1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:13:41 +0200
Subject: [PATCH 0523/1124] upgrade gitlab-pages to 1.21.0

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

diff --git a/Dockerfile b/Dockerfile
index 79fd65c5e..a93dee59d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.14.6 \
     GITLAB_SHELL_VERSION=13.4.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
-    GITLAB_PAGES_VERSION=1.18.0 \
+    GITLAB_PAGES_VERSION=1.21.0 \
     GITALY_SERVER_VERSION=13.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 07442e00eac2e95b0130f9b6c861b5574209fce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:14:46 +0200
Subject: [PATCH 0524/1124] upgrade gitlab to 13.2.0

---
 Dockerfile                 |  2 +-
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.swarm.yml   |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a93dee59d..c348defba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.0.7
+ARG VERSION=13.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index 10fb45a74..733d4fd51 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.0.7
+# sameersbn/gitlab:13.2.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.7
+docker pull sameersbn/gitlab:13.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.0.7
+ sameersbn/gitlab:13.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.0.7
+    sameersbn/gitlab:13.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:sanitize
+    sameersbn/gitlab:13.2.0 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake db:setup
+    sameersbn/gitlab:13.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.7 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.0.7` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.7
+docker pull sameersbn/gitlab:13.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.7
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.0
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.0.7
+    image: sameersbn/gitlab:13.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4e8f3240e..67aee2394 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.0.7
+13.2.0
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6b112621b..c98672ddd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.0.0
+    image: sameersbn/gitlab:13.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d52c2b5a..84262f79e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.0.7
+    image: sameersbn/gitlab:13.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e86972f1a..f28748d35 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.0.7
+docker pull sameersbn/gitlab:13.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.0.7
+sameersbn/gitlab:13.2.0
 ```
 
 

From 3f349977f582816a5e65f2570c6603f4e8d49622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 18:25:07 +0200
Subject: [PATCH 0525/1124] update patch to work on gitlab 13.2.0+

---
 ...ecking-for-gitaly-on-a-fresh-install.patch | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
index 29078a428..86c366105 100644
--- a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
+++ b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
@@ -1,15 +1,5 @@
-From 36bf91a3fd423d9ee564ae669a271c714362d648 Mon Sep 17 00:00:00 2001
-From: solidnerd <niclas@mietz.io>
-Date: Sun, 29 Mar 2020 11:14:40 +0200
-Subject: [PATCH] fix: feature checking for gitaly on a fresh install
-
-Signed-off-by: solidnerd <niclas@mietz.io>
----
- lib/feature.rb | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/lib/feature.rb b/lib/feature.rb
-index aadc2c64957..1d39a921465 100644
+index 7cf40b63fdf..f225a666cfc 100644
 --- a/lib/feature.rb
 +++ b/lib/feature.rb
 @@ -33,6 +33,7 @@ class Feature
@@ -18,16 +8,13 @@ index aadc2c64957..1d39a921465 100644
        return [] unless Gitlab::Database.exists?
 +      return [] unless Feature::FlipperFeature.table_exists?
  
-       Gitlab::SafeRequestStore[:flipper_persisted_names] ||=
-         begin
-@@ -57,6 +58,7 @@ class Feature
+       # This loads names of all stored feature flags
+       # and returns a stable Set in the following order:
+@@ -67,6 +68,7 @@ class Feature
        # During setup the database does not exist yet. So we haven't stored a value
        # for the feature yet and return the default.
        return default_enabled unless Gitlab::Database.exists?
 +      return default_enabled unless Feature::FlipperFeature.table_exists?
  
-       feature = Feature.get(key)
+       feature = get(key)
  
--- 
-2.25.2
-

From ad57e9f35409d3f707ec08baaecec5bdd7159940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 19:03:14 +0200
Subject: [PATCH 0526/1124] add gitlab url to gitaly.toml config

---
 assets/runtime/config/gitaly/config.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index 6aa63be7f..bfbb1d6f1 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -91,3 +91,7 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 # [[concurrency]]
 # rpc = "/gitaly.RepositoryService/GarbageCollect"
 # max_per_repo = 1
+
+[gitlab]
+url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
+

From 0711c9279fa49f40cf817fbf802b0f7bc9ce6589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 27 Jul 2020 19:06:52 +0200
Subject: [PATCH 0527/1124] upgrade gitlab to 13.2.1

---
 Dockerfile                 |  2 +-
 VERSION                    |  2 +-
 docker-compose.swarm.yml   |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c348defba..b08981a33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.2.0
+ARG VERSION=13.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/VERSION b/VERSION
index 67aee2394..947f4e996 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.0
+13.2.1
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c98672ddd..95fb521c7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.2.0
+    image: sameersbn/gitlab:13.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 84262f79e..1526475b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.0
+    image: sameersbn/gitlab:13.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f28748d35..44f62d27d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.0
+docker pull sameersbn/gitlab:13.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.0
+sameersbn/gitlab:13.2.1
 ```
 
 

From cc9d27daea6e6ba43cf23ad8ba0d647817bc304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Tue, 28 Jul 2020 11:55:27 +0200
Subject: [PATCH 0528/1124] fix wrong/old image versions in docs

---
 README.md                               | 56 ++++++++++++-------------
 contrib/docker-swarm/docker-compose.yml |  6 +--
 docs/docker-compose-keycloak.yml        |  8 ++--
 docs/docker-compose-registry.yml        |  6 +--
 kubernetes/gitlab-rc.yml                |  2 +-
 kubernetes/postgresql-rc.yml            |  2 +-
 kubernetes/redis-rc.yml                 |  2 +-
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 733d4fd51..a52afdfe3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.0
+# sameersbn/gitlab:13.2.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.0
+docker pull sameersbn/gitlab:13.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.0
+ sameersbn/gitlab:13.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.0
+    sameersbn/gitlab:13.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:sanitize
+    sameersbn/gitlab:13.2.1 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake db:setup
+    sameersbn/gitlab:13.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.0
+docker pull sameersbn/gitlab:13.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.1
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.0
+    image: sameersbn/gitlab:13.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 3e83e3262..c715892f0 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-2
+    image: redis:5.0.9
     command:
     - --loglevel warning
     volumes:
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:9.6-2
+    image: sameersbn/postgresql:11-20200524
     volumes:
     - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:10.7.2
+    image: sameersbn/gitlab:13.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 54031cdc1..13d72f177 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-2
+    image: redis:5.0.9
     command:
     - --loglevel warning
     volumes:
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:10-2
+    image: sameersbn/postgresql:11-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: nuberabe/docker-gitlab:12.7.0
+    image: sameersbn/gitlab:13.2.1
     depends_on:
     - redis
     - postgresql
@@ -177,4 +177,4 @@ services:
 volumes:
   redis-data:
   postgresql-data:
-  gitlab-data:
\ No newline at end of file
+  gitlab-data:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f9fd537ca..75365483e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-2
+    image: redis:5.0.9
     command:
     - --loglevel warning
     volumes:
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:9.5-3
+    image: sameersbn/postgresql:11-20200524
     volumes:
     - postgresql:/var/lib/postgresql:Z
     environment:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:8.12.7
+    image: sameersbn/gitlab:13.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1f4de30bb..85be1d6cf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.0.7
+        image: sameersbn/gitlab:13.2.1
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index 42df975a0..de00601e2 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:10-2
+        image: sameersbn/postgresql:11-20200524
         env:
         - name: DB_USER
           value: gitlab
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index dc8344426..96a6119f9 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: sameersbn/redis
+        image: redis:5.0.9
         ports:
         - name: redis
           containerPort: 6379

From 7a70e6a0f6dcbd4d925029591aaaf528fbaa609c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Tue, 28 Jul 2020 12:00:12 +0200
Subject: [PATCH 0529/1124] update changelog

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 26517f158..28aa32a99 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.2.1**
+- gitlab: upgrade CE to v13.2.1
+
 **13.0.7**
 - gitlab: upgrade CE to v13.0.7
 

From 8411b944e445f3eeb2f73bbfffcc6ccb34114b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Tue, 28 Jul 2020 12:38:23 +0200
Subject: [PATCH 0530/1124] fix wrong gitaly configuration

---
 assets/runtime/config/gitaly/config.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index bfbb1d6f1..4fb47045d 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -93,5 +93,6 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 # max_per_repo = 1
 
 [gitlab]
-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
+secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
+url = "http://localhost:8181"
 

From 015fc32c3a457a0691239d537e98124966b132f8 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 2 Aug 2020 17:16:35 +0200
Subject: [PATCH 0531/1124] Upgrade GitLab CE to 13.2.2

---
 Changelog.md               |  3 ++
 Dockerfile                 |  4 +--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  2 +-
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 28aa32a99..54ce94092 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.2.2**
+- gitlab: upgrade CE to v13.2.2
+
 **13.2.1**
 - gitlab: upgrade CE to v13.2.1
 
diff --git a/Dockerfile b/Dockerfile
index b08981a33..d4a4eba87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.2.1
+ARG VERSION=13.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.4.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
-    GITALY_SERVER_VERSION=13.2.1 \
+    GITALY_SERVER_VERSION=13.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a52afdfe3..ec502f769 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.1
+# sameersbn/gitlab:13.2.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.1
+docker pull sameersbn/gitlab:13.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.1
+ sameersbn/gitlab:13.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.1
+    sameersbn/gitlab:13.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:sanitize
+    sameersbn/gitlab:13.2.2 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake db:setup
+    sameersbn/gitlab:13.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.1
+docker pull sameersbn/gitlab:13.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.2
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 947f4e996..83de0bb17 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.1
+13.2.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 1526475b0..50b187b90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 44f62d27d..04b16eda8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.1
+docker pull sameersbn/gitlab:13.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.1
+sameersbn/gitlab:13.2.2
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 85be1d6cf..dcf40f9af 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.2.1
+        image: sameersbn/gitlab:13.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From dc698f8456eb98d77d8b706dce93d12970a78109 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sun, 2 Aug 2020 17:17:04 +0200
Subject: [PATCH 0532/1124] Update gitlab-shell to 13.3.0

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d4a4eba87..6c98202f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=13.2.2
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.14.6 \
-    GITLAB_SHELL_VERSION=13.4.0 \
+    GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
     GITALY_SERVER_VERSION=13.2.2 \

From 740677fe34e60c68445bf81234a112d243b602b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Tue, 11 Aug 2020 13:27:13 +0200
Subject: [PATCH 0533/1124] fixes #2200

---
 assets/runtime/config/gitaly/config.toml | 2 +-
 assets/runtime/functions                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index 4fb47045d..0b070505e 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -94,5 +94,5 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 
 [gitlab]
 secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
-url = "http://localhost:8181"
+url = "http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}"
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 81f4a366a..e6f83c035 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -240,7 +240,8 @@ gitlab_configure_gitaly() {
     GITLAB_GITALY_INSTALL_DIR \
     GITLAB_LOG_DIR \
     GITLAB_REPOS_DIR \
-    GITLAB_SHELL_INSTALL_DIR
+    GITLAB_SHELL_INSTALL_DIR \
+    GITLAB_RELATIVE_URL_ROOT
 
   update_template ${GITLAB_CONFIG} \
     GITALY_CLIENT_PATH \

From 4ede759e5a9ee17564823b683f7b804be3eb2982 Mon Sep 17 00:00:00 2001
From: "Drahos, Vojtech" <vdrahos@netsuite.com>
Date: Mon, 10 Aug 2020 09:58:14 +0200
Subject: [PATCH 0534/1124] Upgrade gitlab to 13.2.3

---
 Changelog.md               |  6 ++++
 Dockerfile                 |  6 ++--
 README.md                  | 56 +++++++++++++++++++-------------------
 VERSION                    |  2 +-
 docker-compose.yml         |  4 +--
 docs/container_registry.md | 10 +++----
 kubernetes/gitlab-rc.yml   |  2 +-
 7 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 54ce94092..aadf53a7b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.2.3**
+- gitlab: upgrade CE to v13.2.3
+- golang: upgrade to 1.14.7
+- gitaly: upgrade to 13.2.3
+- postgresql: add btree_gist extension 
+
 **13.2.2**
 - gitlab: upgrade CE to v13.2.2
 
diff --git a/Dockerfile b/Dockerfile
index 6c98202f8..2030c5161 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20200403
 
-ARG VERSION=13.2.2
+ARG VERSION=13.2.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.14.6 \
+    GOLANG_VERSION=1.14.7 \
     GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
-    GITALY_SERVER_VERSION=13.2.2 \
+    GITALY_SERVER_VERSION=13.2.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ec502f769..d6af3b61f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.2
+# sameersbn/gitlab:13.2.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.2
+docker pull sameersbn/gitlab:13.2.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.2
+ sameersbn/gitlab:13.2.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.2
+    sameersbn/gitlab:13.2.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:sanitize
+    sameersbn/gitlab:13.2.3 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake db:setup
+    sameersbn/gitlab:13.2.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.2
+docker pull sameersbn/gitlab:13.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.3
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.2
+    image: sameersbn/gitlab:13.2.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 83de0bb17..d8308f987 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.2
+13.2.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 50b187b90..602a76114 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,11 +18,11 @@ services:
     - DB_USER=gitlab
     - DB_PASS=password
     - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+    - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.2
+    image: sameersbn/gitlab:13.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 04b16eda8..05cc79965 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.2
+docker pull sameersbn/gitlab:13.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.2
+sameersbn/gitlab:13.2.3
 ```
 
 
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dcf40f9af..63b6a23da 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.2.2
+        image: sameersbn/gitlab:13.2.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 4eb85d10306d55840466b5292e0729a8a1031667 Mon Sep 17 00:00:00 2001
From: "Drahos, Vojtech" <vdrahos@netsuite.com>
Date: Thu, 13 Aug 2020 09:31:49 +0200
Subject: [PATCH 0535/1124] Upgrade Gitlab to 13.2.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  6 +--
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aadf53a7b..6154b57ed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.2.4**
+- gitlab: upgrade CE to v13.2.4
+- ubuntu: upgrade to bionic-20200713
+
 **13.2.3**
 - gitlab: upgrade CE to v13.2.3
 - golang: upgrade to 1.14.7
diff --git a/Dockerfile b/Dockerfile
index 2030c5161..930fd2106 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:bionic-20200403
+FROM ubuntu:bionic-20200713
 
-ARG VERSION=13.2.3
+ARG VERSION=13.2.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
-    GITALY_SERVER_VERSION=13.2.3 \
+    GITALY_SERVER_VERSION=13.2.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d6af3b61f..c39aa1308 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.3
+# sameersbn/gitlab:13.2.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.3
+docker pull sameersbn/gitlab:13.2.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.3
+ sameersbn/gitlab:13.2.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.3
+    sameersbn/gitlab:13.2.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:sanitize
+    sameersbn/gitlab:13.2.4 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake db:setup
+    sameersbn/gitlab:13.2.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.3
+docker pull sameersbn/gitlab:13.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.4
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.3
+    image: sameersbn/gitlab:13.2.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d8308f987..0a84f132a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.3
+13.2.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c715892f0..c634b7f43 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 95fb521c7..d3cbb758f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 602a76114..02a91bbc7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.3
+    image: sameersbn/gitlab:13.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 05cc79965..80f5b8b5b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.3
+docker pull sameersbn/gitlab:13.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.3
+sameersbn/gitlab:13.2.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 13d72f177..ed001c16f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 75365483e..2e3a7db32 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.1
+    image: sameersbn/gitlab:13.2.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 63b6a23da..dc4fef7e7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.2.3
+        image: sameersbn/gitlab:13.2.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 81523f757ca0cdcc02c0be52e558cc7cf0af12bf Mon Sep 17 00:00:00 2001
From: "Drahos, Vojtech" <vdrahos@netsuite.com>
Date: Wed, 19 Aug 2020 13:01:10 +0200
Subject: [PATCH 0536/1124] Upgrade gitlab to v13.2.6

---
 Changelog.md                            |  3 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6154b57ed..dd1dfd66b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.2.6**
+- gitlab: upgrade CE to v13.2.6
+
 **13.2.4**
 - gitlab: upgrade CE to v13.2.4
 - ubuntu: upgrade to bionic-20200713
diff --git a/Dockerfile b/Dockerfile
index 930fd2106..6b988e076 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200713
 
-ARG VERSION=13.2.4
+ARG VERSION=13.2.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
-    GITALY_SERVER_VERSION=13.2.4 \
+    GITALY_SERVER_VERSION=13.2.6 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c39aa1308..96fd41077 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.4
+# sameersbn/gitlab:13.2.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.4
+docker pull sameersbn/gitlab:13.2.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.4
+ sameersbn/gitlab:13.2.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.4
+    sameersbn/gitlab:13.2.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:sanitize
+    sameersbn/gitlab:13.2.6 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake db:setup
+    sameersbn/gitlab:13.2.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.6 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.2.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.2.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.2.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.4
+docker pull sameersbn/gitlab:13.2.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.6
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0a84f132a..9a30e1157 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.4
+13.2.6
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c634b7f43..ab38dd51e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d3cbb758f..1a95c313b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 02a91bbc7..ff78ff354 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 80f5b8b5b..9edcbb97b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.4
+docker pull sameersbn/gitlab:13.2.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.4
+sameersbn/gitlab:13.2.6
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ed001c16f..9fab4a0bc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2e3a7db32..b91ade33e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.4
+    image: sameersbn/gitlab:13.2.6
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dc4fef7e7..d0e26e352 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.2.4
+        image: sameersbn/gitlab:13.2.6
         env:
         - name: TZ
           value: Asia/Kolkata

From 67464b56399b8ce44988e7da45a457188ad0f9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:43:54 +0200
Subject: [PATCH 0537/1124] upgrade gitlab ce to v13.3.0

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

diff --git a/Dockerfile b/Dockerfile
index 6b988e076..f26485632 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200713
 
-ARG VERSION=13.2.6
+ARG VERSION=13.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \

From c5c7dbfce8f57e31aa302812d02493df47d3d1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:44:13 +0200
Subject: [PATCH 0538/1124] upgrade gitaly to v13.3.0

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

diff --git a/Dockerfile b/Dockerfile
index f26485632..c128001e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.21.0 \
-    GITALY_SERVER_VERSION=13.2.6 \
+    GITALY_SERVER_VERSION=13.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From b5bd6bb4666f2155c8c10679c714c2090c49c77e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:44:30 +0200
Subject: [PATCH 0539/1124] upgrade gital-pages to v1.22.0

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

diff --git a/Dockerfile b/Dockerfile
index c128001e9..af313133e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.14.7 \
     GITLAB_SHELL_VERSION=13.3.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
-    GITLAB_PAGES_VERSION=1.21.0 \
+    GITLAB_PAGES_VERSION=1.22.0 \
     GITALY_SERVER_VERSION=13.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 3c5b5ddb05658b9e415845462f3195147383819c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:44:47 +0200
Subject: [PATCH 0540/1124] upgrade gital-shell to v13.6.0

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

diff --git a/Dockerfile b/Dockerfile
index af313133e..82e704228 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=13.3.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.14.7 \
-    GITLAB_SHELL_VERSION=13.3.0 \
+    GITLAB_SHELL_VERSION=13.6.0 \
     GITLAB_WORKHORSE_VERSION=8.37.0 \
     GITLAB_PAGES_VERSION=1.22.0 \
     GITALY_SERVER_VERSION=13.3.3 \

From 32228ea1ecd4bd42d9add739e6d14833d6b5ef39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:45:05 +0200
Subject: [PATCH 0541/1124] upgrade gital-workhorse to v8.39.0

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

diff --git a/Dockerfile b/Dockerfile
index 82e704228..c9b6db4b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.14.7 \
     GITLAB_SHELL_VERSION=13.6.0 \
-    GITLAB_WORKHORSE_VERSION=8.37.0 \
+    GITLAB_WORKHORSE_VERSION=8.39.0 \
     GITLAB_PAGES_VERSION=1.22.0 \
     GITALY_SERVER_VERSION=13.3.3 \
     GITLAB_USER="git" \

From 2a96892dee75cad8c0a5c272042180370c76d046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:46:35 +0200
Subject: [PATCH 0542/1124] update docs

---
 Changelog.md                     | 11 +++++--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.swarm.yml         |  4 +--
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-keycloak.yml |  4 +--
 docs/docker-compose-registry.yml |  4 +--
 kubernetes/gitlab-rc.yml         |  2 +-
 9 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dd1dfd66b..8eda627ed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.3.0**
+- gitlab: upgrade CE to v13.3.0
+- gitaly: upgrade to v13.3.0
+- gitlab-pages: upgrade to v1.22.0
+- gitlab-shell: upgrade to v13.6.0
+- gitlab-workhorse: upgrade to v8.39.0
+
 **13.2.6**
 - gitlab: upgrade CE to v13.2.6
 
@@ -14,7 +21,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab: upgrade CE to v13.2.3
 - golang: upgrade to 1.14.7
 - gitaly: upgrade to 13.2.3
-- postgresql: add btree_gist extension 
+- postgresql: add btree_gist extension
 
 **13.2.2**
 - gitlab: upgrade CE to v13.2.2
@@ -61,7 +68,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
-- 
+-
 **12.9.2**
 - gitlab: upgrade CE to v12.9.2
 
diff --git a/README.md b/README.md
index 96fd41077..12f3ff502 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.2.6
+# sameersbn/gitlab:13.3.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.6
+docker pull sameersbn/gitlab:13.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.2.6
+ sameersbn/gitlab:13.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.2.6
+    sameersbn/gitlab:13.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:sanitize
+    sameersbn/gitlab:13.3.0 app:sanitize
 ```
 
 ### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake db:setup
+    sameersbn/gitlab:13.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1178,14 +1178,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.2.6 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:env:info
+    sameersbn/gitlab:13.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1241,7 +1241,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1294,12 +1294,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.2.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.6
+docker pull sameersbn/gitlab:13.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.2.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.0
 ```
 
 ## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9a30e1157..ac565bc1c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.6
+13.3.0
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1a95c313b..30bd72947 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -19,7 +19,7 @@ services:
     - DB_USER=gitlab
     - DB_PASS=password
     - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+    - DB_EXTENSION=pg_trgm,btree_gist
     deploy:
       placement:
         constraints:
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ff78ff354..e0718a4d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9edcbb97b..da797045b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.2.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.2.6
+docker pull sameersbn/gitlab:13.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.2.6
+sameersbn/gitlab:13.3.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9fab4a0bc..bca3c61e6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -18,11 +18,11 @@ services:
     - DB_USER=gitlab
     - DB_PASS=password
     - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+    - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b91ade33e..34a20c2d2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -18,11 +18,11 @@ services:
     - DB_USER=gitlab
     - DB_PASS=password
     - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+    - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d0e26e352..3152e2f26 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.2.6
+        image: sameersbn/gitlab:13.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 71d3b8c2d2c246adfde53dc810ff13ec2b5e0bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:50:43 +0200
Subject: [PATCH 0543/1124] fix wrong gitaly version

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

diff --git a/Dockerfile b/Dockerfile
index c9b6db4b6..4c97ffd6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.6.0 \
     GITLAB_WORKHORSE_VERSION=8.39.0 \
     GITLAB_PAGES_VERSION=1.22.0 \
-    GITALY_SERVER_VERSION=13.3.3 \
+    GITALY_SERVER_VERSION=13.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 3c148f010dd6fa2ea0d446880b59ae6f369af8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Mon, 24 Aug 2020 10:54:08 +0200
Subject: [PATCH 0544/1124] remove hyphen

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 8eda627ed..5dec3cdb5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -68,7 +68,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
--
+
 **12.9.2**
 - gitlab: upgrade CE to v12.9.2
 

From b45f86cd9b91075f59890c277528926038ee0d32 Mon Sep 17 00:00:00 2001
From: John Regan <john@jrjrtech.com>
Date: Mon, 24 Aug 2020 14:53:24 -0400
Subject: [PATCH 0545/1124] Allow setting sshd MaxStartups with env variable
 (fixes #969) (#1111)

---
 README.md                   | 1 +
 assets/runtime/env-defaults | 1 +
 assets/runtime/functions    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 12f3ff502..4792a4f82 100644
--- a/README.md
+++ b/README.md
@@ -873,6 +873,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_BACKUP_SKIP` | Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) |
 | `GITLAB_SSH_HOST` | The ssh host. Defaults to **GITLAB_HOST**. |
 | `GITLAB_SSH_LISTEN_PORT` | The ssh port for SSHD to listen on. Defaults to `22` |
+| `GITLAB_SSH_MAXSTARTUPS` | The ssh "MaxStartups" parameter, defaults to `10:30:60`. |
 | `GITLAB_SSH_PORT` | The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. |
 | `GITLAB_RELATIVE_URL_ROOT` | The relative url of the GitLab server, e.g. `/git`. No default. |
 | `GITLAB_TRUSTED_PROXIES` | Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index e3a7362c3..db1eb56fc 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -28,6 +28,7 @@ GITLAB_SSH_HOST=${GITLAB_SSH_HOST:-$GITLAB_HOST}
 GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-$GITLAB_SHELL_SSH_PORT} # for backwards compatibility
 GITLAB_SSH_LISTEN_PORT=${GITLAB_SSH_LISTEN_PORT:-22}
 GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-$GITLAB_SSH_LISTEN_PORT}
+GITLAB_SSH_MAXSTARTUPS=${GITLAB_SSH_MAXSTARTUPS:-10:30:60}
 
 NGINX_HSTS_ENABLED=${NGINX_HSTS_ENABLED:-$GITLAB_HTTPS_HSTS_ENABLED} # backward compatibility
 NGINX_HSTS_ENABLED=${NGINX_HSTS_ENABLED:-true}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index e6f83c035..a4e0ef4d6 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1497,6 +1497,7 @@ generate_ssh_key() {
 }
 
 generate_ssh_host_keys() {
+  sed -i "s|^[#]*MaxStartups 10:30:60|MaxStartups ${GITLAB_SSH_MAXSTARTUPS}|" /etc/ssh/sshd_config
   sed -i "s|#HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config
   if [[ ! -e ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key ]]; then
     echo -n "Generating OpenSSH host keys... "

From 196819a6c91236f9412846d5444dd4b46b78c76a Mon Sep 17 00:00:00 2001
From: Alessandro Pezzato <alepez@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:25:35 +0200
Subject: [PATCH 0546/1124] Add upgrading notes for 13.3.0

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4792a4f82..dff39f1f3 100644
--- a/README.md
+++ b/README.md
@@ -1287,7 +1287,7 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:9.4-18` or later and add `DB_EXTENSION=pg_trgm` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
+> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:11-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 

From e568235b35252ae4b1e6964d1c05e16868da75aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Wed, 26 Aug 2020 12:26:13 +0200
Subject: [PATCH 0547/1124] upgrade gitaly to v13.3.1

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

diff --git a/Dockerfile b/Dockerfile
index 4c97ffd6a..d12aeb2c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.6.0 \
     GITLAB_WORKHORSE_VERSION=8.39.0 \
     GITLAB_PAGES_VERSION=1.22.0 \
-    GITALY_SERVER_VERSION=13.3.0 \
+    GITALY_SERVER_VERSION=13.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 1fc64666db4a4e830b8d96075185cab7493a0727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?=
 <constantin@wildfoerster.org>
Date: Wed, 26 Aug 2020 12:27:33 +0200
Subject: [PATCH 0548/1124] upgrade gilab CE to v13.3.1

---
 Changelog.md                     |  4 +++
 Dockerfile                       |  2 +-
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.swarm.yml         |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-keycloak.yml |  2 +-
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 10 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5dec3cdb5..b3262101d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.3.1**
+- gitlab: upgrade CE to v13.3.1
+- gitaly: upgrade to v13.3.1
+
 **13.3.0**
 - gitlab: upgrade CE to v13.3.0
 - gitaly: upgrade to v13.3.0
diff --git a/Dockerfile b/Dockerfile
index d12aeb2c4..c7f46a94b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200713
 
-ARG VERSION=13.3.0
+ARG VERSION=13.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
diff --git a/README.md b/README.md
index dff39f1f3..3024f4756 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.3.0
+# sameersbn/gitlab:13.3.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.0
+docker pull sameersbn/gitlab:13.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.3.0
+ sameersbn/gitlab:13.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.3.0
+    sameersbn/gitlab:13.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:sanitize
+    sameersbn/gitlab:13.3.1 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake db:setup
+    sameersbn/gitlab:13.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.0
+docker pull sameersbn/gitlab:13.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.1
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.3.0
+    image: sameersbn/gitlab:13.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ac565bc1c..c3d10c59d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.0
+13.3.1
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 30bd72947..fe1f42a70 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.3.0
+    image: sameersbn/gitlab:13.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e0718a4d5..000352523 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.0
+    image: sameersbn/gitlab:13.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index da797045b..f9e58e424 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.0
+docker pull sameersbn/gitlab:13.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.3.0
+sameersbn/gitlab:13.3.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index bca3c61e6..34cf442b0 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.0
+    image: sameersbn/gitlab:13.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 34a20c2d2..b88dbe1f2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.0
+    image: sameersbn/gitlab:13.3.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3152e2f26..39d559e1e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.3.0
+        image: sameersbn/gitlab:13.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 51509c6b190b4333d6f7e35f116f780186b38d54 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Thu, 3 Sep 2020 03:39:37 +0200
Subject: [PATCH 0549/1124] gitlab release 13.3.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b3262101d..60abb5b1a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.3.4**
+- gitlab: upgrade CE to v13.3.4
+- gitaly: upgrade to v13.3.4
+
 **13.3.1**
 - gitlab: upgrade CE to v13.3.1
 - gitaly: upgrade to v13.3.1
diff --git a/Dockerfile b/Dockerfile
index c7f46a94b..fa7621cc1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200713
 
-ARG VERSION=13.3.1
+ARG VERSION=13.3.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.6.0 \
     GITLAB_WORKHORSE_VERSION=8.39.0 \
     GITLAB_PAGES_VERSION=1.22.0 \
-    GITALY_SERVER_VERSION=13.3.1 \
+    GITALY_SERVER_VERSION=13.3.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3024f4756..1748f1237 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.3.1
+# sameersbn/gitlab:13.3.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.1
+docker pull sameersbn/gitlab:13.3.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.3.1
+ sameersbn/gitlab:13.3.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.3.1
+    sameersbn/gitlab:13.3.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:sanitize
+    sameersbn/gitlab:13.3.4 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake db:setup
+    sameersbn/gitlab:13.3.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.3.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.3.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.1
+docker pull sameersbn/gitlab:13.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.4
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.3.1
+    image: sameersbn/gitlab:13.3.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c3d10c59d..51d9561af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.1
+13.3.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ab38dd51e..6e2284207 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.2.6
+    image: sameersbn/gitlab:13.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index fe1f42a70..54d9e8b2b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.3.1
+    image: sameersbn/gitlab:13.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 000352523..3d03a784f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.1
+    image: sameersbn/gitlab:13.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f9e58e424..e92820b4f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.1
+docker pull sameersbn/gitlab:13.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.3.1
+sameersbn/gitlab:13.3.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 34cf442b0..5f4018bb8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.1
+    image: sameersbn/gitlab:13.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b88dbe1f2..1e6b588bb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.1
+    image: sameersbn/gitlab:13.3.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 39d559e1e..8e2387f9d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.3.1
+        image: sameersbn/gitlab:13.3.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 6fea01799bef8ee2ef376916ab1502b872a2aab5 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Wed, 2 Sep 2020 19:18:27 +0200
Subject: [PATCH 0550/1124] go release 1.15.1

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

diff --git a/Dockerfile b/Dockerfile
index fa7621cc1..4c7f779d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=13.3.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.14.7 \
+    GOLANG_VERSION=1.15.1 \
     GITLAB_SHELL_VERSION=13.6.0 \
     GITLAB_WORKHORSE_VERSION=8.39.0 \
     GITLAB_PAGES_VERSION=1.22.0 \

From fe7bc00698e1f955b4fa709cadd7ffa3730dcf73 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Wed, 2 Sep 2020 19:19:38 +0200
Subject: [PATCH 0551/1124] build from ubuntu:bionic-20200807

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

diff --git a/Dockerfile b/Dockerfile
index 4c7f779d7..beac67a5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200713
+FROM ubuntu:bionic-20200807
 
 ARG VERSION=13.3.4
 

From 12cc95ed19eca2e3816fad0c8285be8bf4ae51da Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 21 Sep 2020 23:01:49 +0200
Subject: [PATCH 0552/1124] gitlab release 13.4.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 14 +++----
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 60abb5b1a..1f464762e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.4.0**
+- gitlab: upgrade CE to v13.4.0
+- gitaly: upgrade to v13.4.0
+- gitlab-pages: upgrade to 1.25.0
+- gitlab-workhorse: upgrade to 8.46.0
+- gitlab-shell: uprade to 13.7.0
+- ubuntu: upgrade to bionic-20200903
+
 **13.3.4**
 - gitlab: upgrade CE to v13.3.4
 - gitaly: upgrade to v13.3.4
diff --git a/Dockerfile b/Dockerfile
index beac67a5b..8731b920f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:bionic-20200807
+FROM ubuntu:bionic-20200903
 
-ARG VERSION=13.3.4
+ARG VERSION=13.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.15.1 \
-    GITLAB_SHELL_VERSION=13.6.0 \
-    GITLAB_WORKHORSE_VERSION=8.39.0 \
-    GITLAB_PAGES_VERSION=1.22.0 \
-    GITALY_SERVER_VERSION=13.3.4 \
+    GOLANG_VERSION=1.15.2 \
+    GITLAB_SHELL_VERSION=13.7.0 \
+    GITLAB_WORKHORSE_VERSION=8.46.0 \
+    GITLAB_PAGES_VERSION=1.25.0 \
+    GITALY_SERVER_VERSION=13.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1748f1237..ac6d7e18b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.3.4
+# sameersbn/gitlab:13.4.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.4
+docker pull sameersbn/gitlab:13.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.3.4
+ sameersbn/gitlab:13.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.3.4
+    sameersbn/gitlab:13.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:sanitize
+    sameersbn/gitlab:13.4.0 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake db:setup
+    sameersbn/gitlab:13.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.3.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.4
+docker pull sameersbn/gitlab:13.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.3.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.0
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 51d9561af..74302c511 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.4
+13.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6e2284207..7d3d42215 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 54d9e8b2b..65b268e2b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d03a784f..6e7e44735 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e92820b4f..2b4d46c3f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.3.4
+docker pull sameersbn/gitlab:13.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.3.4
+sameersbn/gitlab:13.4.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5f4018bb8..39a3c824e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1e6b588bb..58a37233e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.3.4
+    image: sameersbn/gitlab:13.4.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8e2387f9d..a6d73da67 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.3.4
+        image: sameersbn/gitlab:13.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d36d781852570addb2d9e02bc67c8e8a2fab662c Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sat, 26 Sep 2020 23:58:27 +0200
Subject: [PATCH 0553/1124] gitab release 13.4.1

---
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8731b920f..10733b668 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200903
 
-ARG VERSION=13.4.0
+ARG VERSION=13.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.7.0 \
     GITLAB_WORKHORSE_VERSION=8.46.0 \
     GITLAB_PAGES_VERSION=1.25.0 \
-    GITALY_SERVER_VERSION=13.4.0 \
+    GITALY_SERVER_VERSION=13.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ac6d7e18b..0850c0023 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.4.0
+# sameersbn/gitlab:13.4.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.0
+docker pull sameersbn/gitlab:13.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.4.0
+ sameersbn/gitlab:13.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.4.0
+    sameersbn/gitlab:13.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:sanitize
+    sameersbn/gitlab:13.4.1 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake db:setup
+    sameersbn/gitlab:13.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.0
+docker pull sameersbn/gitlab:13.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.1
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 74302c511..c27905ac3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.0
+13.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7d3d42215..b48c66838 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 65b268e2b..8a01c6949 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e7e44735..a6e9e3b00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2b4d46c3f..a8b6a2523 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.0
+docker pull sameersbn/gitlab:13.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.4.0
+sameersbn/gitlab:13.4.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 39a3c824e..0bff64284 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 58a37233e..84176e26d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.0
+    image: sameersbn/gitlab:13.4.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a6d73da67..69ef4f2b1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.4.0
+        image: sameersbn/gitlab:13.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 29f1bd4d079b46f5c900a17a074f7ee3e4073346 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sat, 26 Sep 2020 23:59:15 +0200
Subject: [PATCH 0554/1124] build from ubuntu:bionic-20200921

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

diff --git a/Dockerfile b/Dockerfile
index 10733b668..937d4de0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200903
+FROM ubuntu:bionic-20200921
 
 ARG VERSION=13.4.1
 

From fd139523ba87b42ec72db0d76ee464906f72ef4b Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sun, 27 Sep 2020 00:04:02 +0200
Subject: [PATCH 0555/1124] update Changelog

---
 Changelog.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1f464762e..147ad07fb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,13 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.4.0**
-- gitlab: upgrade CE to v13.4.0
-- gitaly: upgrade to v13.4.0
+**13.4.1**
+- gitlab: upgrade CE to v13.4.1
+- gitaly: upgrade to v13.4.1
 - gitlab-pages: upgrade to 1.25.0
 - gitlab-workhorse: upgrade to 8.46.0
 - gitlab-shell: uprade to 13.7.0
-- ubuntu: upgrade to bionic-20200903
+- ubuntu: upgrade to bionic-20200921
 
 **13.3.4**
 - gitlab: upgrade CE to v13.3.4

From 14d83ea48e158e1cca34dc19f4b84e1d2fe8386b Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Fri, 2 Oct 2020 16:40:35 +0200
Subject: [PATCH 0556/1124] gitlab release 13.4.2

---
 Changelog.md                            |  6 +--
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 147ad07fb..dd705c657 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,9 +3,9 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.4.1**
-- gitlab: upgrade CE to v13.4.1
-- gitaly: upgrade to v13.4.1
+**13.4.2**
+- gitlab: upgrade CE to v13.4.2
+- gitaly: upgrade to v13.4.2
 - gitlab-pages: upgrade to 1.25.0
 - gitlab-workhorse: upgrade to 8.46.0
 - gitlab-shell: uprade to 13.7.0
diff --git a/Dockerfile b/Dockerfile
index 937d4de0e..4f7e91b5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.4.1
+ARG VERSION=13.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.7.0 \
     GITLAB_WORKHORSE_VERSION=8.46.0 \
     GITLAB_PAGES_VERSION=1.25.0 \
-    GITALY_SERVER_VERSION=13.4.1 \
+    GITALY_SERVER_VERSION=13.4.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0850c0023..f6a3f30ac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.4.1
+# sameersbn/gitlab:13.4.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.1
+docker pull sameersbn/gitlab:13.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.4.1
+ sameersbn/gitlab:13.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.4.1
+    sameersbn/gitlab:13.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:sanitize
+    sameersbn/gitlab:13.4.2 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake db:setup
+    sameersbn/gitlab:13.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.1
+docker pull sameersbn/gitlab:13.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.2
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c27905ac3..f1017ecea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.1
+13.4.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b48c66838..0715212b5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8a01c6949..52466a9a4 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a6e9e3b00..fcda2f696 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a8b6a2523..3506e227d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.1
+docker pull sameersbn/gitlab:13.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.4.1
+sameersbn/gitlab:13.4.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 0bff64284..4ad27fc67 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 84176e26d..05c1414ab 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.1
+    image: sameersbn/gitlab:13.4.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 69ef4f2b1..7c72acaef 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.4.1
+        image: sameersbn/gitlab:13.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 7bd885ca84f152318e9d9ed2cde080ba027ede0c Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Thu, 8 Oct 2020 13:13:22 +0200
Subject: [PATCH 0557/1124] gitlab release 13.4.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dd705c657..0591a35d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.4.3**
+- gitlab: upgrade CE to v13.4.3
+- gitaly: upgrade to v13.4.3
+
 **13.4.2**
 - gitlab: upgrade CE to v13.4.2
 - gitaly: upgrade to v13.4.2
diff --git a/Dockerfile b/Dockerfile
index 4f7e91b5c..6592deb16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.4.2
+ARG VERSION=13.4.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.7.0 \
     GITLAB_WORKHORSE_VERSION=8.46.0 \
     GITLAB_PAGES_VERSION=1.25.0 \
-    GITALY_SERVER_VERSION=13.4.2 \
+    GITALY_SERVER_VERSION=13.4.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f6a3f30ac..bb9e3cb16 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.4.2
+# sameersbn/gitlab:13.4.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.2
+docker pull sameersbn/gitlab:13.4.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.4.2
+ sameersbn/gitlab:13.4.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.4.2
+    sameersbn/gitlab:13.4.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:sanitize
+    sameersbn/gitlab:13.4.3 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake db:setup
+    sameersbn/gitlab:13.4.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.4.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.2
+docker pull sameersbn/gitlab:13.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.3
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f1017ecea..363ad0dba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.2
+13.4.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0715212b5..553c5699a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 52466a9a4..08fd25981 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fcda2f696..2417b9b0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3506e227d..8da4bb538 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.2
+docker pull sameersbn/gitlab:13.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.4.2
+sameersbn/gitlab:13.4.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4ad27fc67..6b948148f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 05c1414ab..5e7d3bd9a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.2
+    image: sameersbn/gitlab:13.4.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7c72acaef..e9f6e2555 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.4.2
+        image: sameersbn/gitlab:13.4.3
         env:
         - name: TZ
           value: Asia/Kolkata

From a4915d00dd7f212a6c79ba4cf3c1e6f5ff6abd86 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 19 Oct 2020 13:03:12 +0200
Subject: [PATCH 0558/1124] gitlab release 13.4.4

---
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6592deb16..3a7d0c3e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.4.3
+ARG VERSION=13.4.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.7.0 \
     GITLAB_WORKHORSE_VERSION=8.46.0 \
     GITLAB_PAGES_VERSION=1.25.0 \
-    GITALY_SERVER_VERSION=13.4.3 \
+    GITALY_SERVER_VERSION=13.4.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bb9e3cb16..ef8226c1b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.4.3
+# sameersbn/gitlab:13.4.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.3
+docker pull sameersbn/gitlab:13.4.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.4.3
+ sameersbn/gitlab:13.4.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.4.3
+    sameersbn/gitlab:13.4.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:sanitize
+    sameersbn/gitlab:13.4.4 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake db:setup
+    sameersbn/gitlab:13.4.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.4.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.4.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.3
+docker pull sameersbn/gitlab:13.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.4
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 363ad0dba..95d24bd62 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.3
+13.4.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 553c5699a..7a2aa547c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 08fd25981..735bed25a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2417b9b0a..63342884f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8da4bb538..848462da1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.3
+docker pull sameersbn/gitlab:13.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.4.3
+sameersbn/gitlab:13.4.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6b948148f..29bcd2343 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 5e7d3bd9a..4aa5f2b3b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.3
+    image: sameersbn/gitlab:13.4.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e9f6e2555..5f342321d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.4.3
+        image: sameersbn/gitlab:13.4.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 2f3eccf98331fdfc870a736785378919077c85da Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 19 Oct 2020 13:04:39 +0200
Subject: [PATCH 0559/1124] go release 1.15.3

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

diff --git a/Dockerfile b/Dockerfile
index 3a7d0c3e1..d4281b3cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=13.4.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.15.2 \
+    GOLANG_VERSION=1.15.3 \
     GITLAB_SHELL_VERSION=13.7.0 \
     GITLAB_WORKHORSE_VERSION=8.46.0 \
     GITLAB_PAGES_VERSION=1.25.0 \

From 9c7b65088da51d59d1475324bcb529f60725ac15 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 19 Oct 2020 13:05:30 +0200
Subject: [PATCH 0560/1124] update Changelog

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 0591a35d8..203672675 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.4.4**
+- gitlab: upgrade CE to v13.4.4
+- gitaly: upgrade to v13.4.4
+
 **13.4.3**
 - gitlab: upgrade CE to v13.4.3
 - gitaly: upgrade to v13.4.3

From d6d006ee3796ab65098c9956b27b0c84850874a1 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sun, 25 Oct 2020 12:59:19 +0100
Subject: [PATCH 0561/1124] Upgrade GitLab CE to 13.5.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 203672675..f29b6f998 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.5.1**
+- gitlab: upgrade CE to v13.5.1
+- gitaly: upgrade v13.5.1
+- gitlab-shell: upgrade to v13.11.0
+- gitlab-pages: upgrade to v1.28.0
+- gitlab-workhorse: upgrade to v8.51.0
+
 **13.4.4**
 - gitlab: upgrade CE to v13.4.4
 - gitaly: upgrade to v13.4.4
diff --git a/Dockerfile b/Dockerfile
index d4281b3cb..36a3bbbba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.4.4
+ARG VERSION=13.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.15.3 \
-    GITLAB_SHELL_VERSION=13.7.0 \
-    GITLAB_WORKHORSE_VERSION=8.46.0 \
-    GITLAB_PAGES_VERSION=1.25.0 \
-    GITALY_SERVER_VERSION=13.4.4 \
+    GITLAB_SHELL_VERSION=13.11.0 \
+    GITLAB_WORKHORSE_VERSION=8.51.0 \
+    GITLAB_PAGES_VERSION=1.28.0 \
+    GITALY_SERVER_VERSION=13.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ef8226c1b..8757014c3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.4.4
+# sameersbn/gitlab:13.5.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.4
+docker pull sameersbn/gitlab:13.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.4.4
+ sameersbn/gitlab:13.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.4.4
+    sameersbn/gitlab:13.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:sanitize
+    sameersbn/gitlab:13.5.1 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake db:setup
+    sameersbn/gitlab:13.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.4.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.4
+docker pull sameersbn/gitlab:13.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.4.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.1
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 95d24bd62..9db846815 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.4
+13.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7a2aa547c..97cb9d412 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 735bed25a..1b979924c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 63342884f..1f60105a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 848462da1..f75838d50 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.4.4
+docker pull sameersbn/gitlab:13.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.4.4
+sameersbn/gitlab:13.5.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 29bcd2343..7f88f04b4 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4aa5f2b3b..8d49ac973 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.4.4
+    image: sameersbn/gitlab:13.5.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5f342321d..61f669e03 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.4.4
+        image: sameersbn/gitlab:13.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 9f1ab32f2902639297b1075155062f3aed563a5c Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 2 Nov 2020 20:57:40 +0100
Subject: [PATCH 0562/1124] Upgrade Gitlab CE to 13.5.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f29b6f998..b7ee17add 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.5.2**
+- gitlab: upgrade CE to v13.5.2
+- gitaly: upgrade v13.5.2
+
 **13.5.1**
 - gitlab: upgrade CE to v13.5.1
 - gitaly: upgrade v13.5.1
diff --git a/Dockerfile b/Dockerfile
index 36a3bbbba..bab48ef69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.5.1
+ARG VERSION=13.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.11.0 \
     GITLAB_WORKHORSE_VERSION=8.51.0 \
     GITLAB_PAGES_VERSION=1.28.0 \
-    GITALY_SERVER_VERSION=13.5.1 \
+    GITALY_SERVER_VERSION=13.5.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8757014c3..bb1aa2759 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.5.1
+# sameersbn/gitlab:13.5.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.1
+docker pull sameersbn/gitlab:13.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.5.1
+ sameersbn/gitlab:13.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.5.1
+    sameersbn/gitlab:13.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:sanitize
+    sameersbn/gitlab:13.5.2 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake db:setup
+    sameersbn/gitlab:13.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.1
+docker pull sameersbn/gitlab:13.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.2
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9db846815..97b2f7e80 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.1
+13.5.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 97cb9d412..1c17bf4fc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1b979924c..ffdae0bf3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f60105a2..ae3cfbb3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f75838d50..45a895a57 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.1
+docker pull sameersbn/gitlab:13.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.5.1
+sameersbn/gitlab:13.5.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7f88f04b4..3893e1ab8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8d49ac973..674e2e3de 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.1
+    image: sameersbn/gitlab:13.5.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 61f669e03..8f68400b7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.5.1
+        image: sameersbn/gitlab:13.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From fe7eb4d3b99efdecdc3facd64c2fa7fe64838562 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Fri, 6 Nov 2020 17:29:17 +0100
Subject: [PATCH 0563/1124] Upgrade to Gitlab CE 13.5.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b7ee17add..1181a5235 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.5.3**
+- gitlab: upgrade CE to v13.5.3
+- gitaly: upgrade v13.5.3
+
 **13.5.2**
 - gitlab: upgrade CE to v13.5.2
 - gitaly: upgrade v13.5.2
diff --git a/Dockerfile b/Dockerfile
index bab48ef69..2130a6f9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.5.2
+ARG VERSION=13.5.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.11.0 \
     GITLAB_WORKHORSE_VERSION=8.51.0 \
     GITLAB_PAGES_VERSION=1.28.0 \
-    GITALY_SERVER_VERSION=13.5.2 \
+    GITALY_SERVER_VERSION=13.5.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bb1aa2759..64755df57 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.5.2
+# sameersbn/gitlab:13.5.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.2
+docker pull sameersbn/gitlab:13.5.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.5.2
+ sameersbn/gitlab:13.5.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.5.2
+    sameersbn/gitlab:13.5.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:sanitize
+    sameersbn/gitlab:13.5.3 app:sanitize
 ```
 
 ### Piwik
@@ -1128,7 +1128,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1163,14 +1163,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake db:setup
+    sameersbn/gitlab:13.5.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1179,14 +1179,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1229,7 +1229,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.5.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1242,7 +1242,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1273,7 +1273,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1295,12 +1295,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.2
+docker pull sameersbn/gitlab:13.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1326,7 +1326,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.3
 ```
 
 ## Shell Access
@@ -1364,7 +1364,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 97b2f7e80..6d883115a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.2
+13.5.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1c17bf4fc..ac7ca0b1e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ffdae0bf3..28aa167af 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ae3cfbb3d..01681ef30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 45a895a57..00fa10ca1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.2
+docker pull sameersbn/gitlab:13.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.5.2
+sameersbn/gitlab:13.5.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3893e1ab8..d1bf70c4c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 674e2e3de..ae55e507d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.2
+    image: sameersbn/gitlab:13.5.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8f68400b7..a74f8000f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.5.2
+        image: sameersbn/gitlab:13.5.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 2d0159b61dab355d16a0f1c60498f0393c301910 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sun, 8 Nov 2020 23:19:05 +0100
Subject: [PATCH 0564/1124] reduce image size

---
 assets/build/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index a29dfd437..0278c92ac 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -135,6 +135,7 @@ chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
 rm -rf ${GITLAB_GITALY_BUILD_DIR}
 
 # remove go
+go clean --modcache
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
 # remove HSTS config from the default headers, we configure it in nginx
@@ -443,3 +444,4 @@ rm -rf /var/lib/apt/lists/*
 
 # clean up caches
 rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go
+rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules

From 0946fef04c9c55d10fa79f8dd8099e6968a19ef0 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Thu, 12 Nov 2020 15:57:50 +0900
Subject: [PATCH 0565/1124] Add GITLAB_PAGES_ARTIFACTS_SERVER_URL

---
 README.md                                 | 1 +
 assets/runtime/config/gitlab-pages/config | 1 +
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 64755df57..a06006f9b 100644
--- a/README.md
+++ b/README.md
@@ -891,6 +891,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` |
 | `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` |
 | `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. |
+| `GITLAB_PAGES_ARTIFACTS_SERVER_URL` | If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No default. |
 | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default |
 | `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. |
diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
index 768d5f95d..8b0edb605 100644
--- a/assets/runtime/config/gitlab-pages/config
+++ b/assets/runtime/config/gitlab-pages/config
@@ -3,3 +3,4 @@ auth-client-secret={{GITLAB_PAGES_ACCESS_CLIENT_SECRET}}
 auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
 auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
+artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index db1eb56fc..4a1c65bb1 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -480,6 +480,7 @@ GITLAB_PAGES_DOMAIN=${GITLAB_PAGES_DOMAIN:-"example.com"}
 GITLAB_PAGES_DIR="${GITLAB_PAGES_DIR:-$GITLAB_SHARED_DIR/pages}"
 GITLAB_PAGES_PORT=${GITLAB_PAGES_PORT:-80}
 GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true}
+GITLAB_PAGES_ARTIFACTS_SERVER_URL=${GITLAB_PAGES_ARTIFACTS_SERVER_URL:-}
 GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false}
 GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-}
 GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index a4e0ef4d6..663d26b48 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1719,6 +1719,12 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_SECRET \
       GITLAB_PAGES_ACCESS_CONTROL_SERVER
 
+  if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
+    update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL
+  else
+    exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG}
+  fi
+
 cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
   -config ${GITLAB_PAGES_CONFIG}
 EOF

From e751fbb7d3cadd3aff7d3db6051201bde6c45530 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sat, 14 Nov 2020 12:50:34 +0100
Subject: [PATCH 0566/1124] Upgrade GitLab CE to 13.5.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1181a5235..5675e4ad6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.5.4**
+- gitlab: upgrade CE to v13.5.4
+- gitaly: upgrade v13.5.4
+
 **13.5.3**
 - gitlab: upgrade CE to v13.5.3
 - gitaly: upgrade v13.5.3
diff --git a/Dockerfile b/Dockerfile
index 2130a6f9b..0cd054d9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.5.3
+ARG VERSION=13.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.11.0 \
     GITLAB_WORKHORSE_VERSION=8.51.0 \
     GITLAB_PAGES_VERSION=1.28.0 \
-    GITALY_SERVER_VERSION=13.5.3 \
+    GITALY_SERVER_VERSION=13.5.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a06006f9b..b2e7172b4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.5.3
+# sameersbn/gitlab:13.5.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.3
+docker pull sameersbn/gitlab:13.5.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.5.3
+ sameersbn/gitlab:13.5.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.5.3
+    sameersbn/gitlab:13.5.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:sanitize
+    sameersbn/gitlab:13.5.4 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake db:setup
+    sameersbn/gitlab:13.5.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.5.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.3
+docker pull sameersbn/gitlab:13.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.4
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6d883115a..ef52cf386 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.3
+13.5.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ac7ca0b1e..fbf90f15e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 28aa167af..d32932778 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 01681ef30..a3aa80241 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 00fa10ca1..77492380b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.3
+docker pull sameersbn/gitlab:13.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.5.3
+sameersbn/gitlab:13.5.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d1bf70c4c..f69a38a31 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ae55e507d..7067c8b05 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.3
+    image: sameersbn/gitlab:13.5.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a74f8000f..7a64eabbe 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.5.3
+        image: sameersbn/gitlab:13.5.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 9e47e44111f8f963f9109da95f978a6356a5b03e Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sat, 14 Nov 2020 12:51:02 +0100
Subject: [PATCH 0567/1124] go release 1.15.5

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

diff --git a/Dockerfile b/Dockerfile
index 0cd054d9d..a120ed463 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=13.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.15.3 \
+    GOLANG_VERSION=1.15.5 \
     GITLAB_SHELL_VERSION=13.11.0 \
     GITLAB_WORKHORSE_VERSION=8.51.0 \
     GITLAB_PAGES_VERSION=1.28.0 \

From 812de4a1cfa9b0a3b965998dcf7cfdd20578858a Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 23 Nov 2020 13:22:09 +0100
Subject: [PATCH 0568/1124] upgrade Gitlab CE to 13.6.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5675e4ad6..0d26ea6bb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.6.0**
+- gitlab: upgrade CE to v13.6.0
+- gitaly: upgrade v13.6.0
+- gitlab-shell: upgrade to v13.13.0
+- gitlab-pages: upgrade to v1.30.0
+- gitlab-workhorse: upgrade to v8.54.0    
+
 **13.5.4**
 - gitlab: upgrade CE to v13.5.4
 - gitaly: upgrade v13.5.4
diff --git a/Dockerfile b/Dockerfile
index a120ed463..3edeb6697 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.5.4
+ARG VERSION=13.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.15.5 \
-    GITLAB_SHELL_VERSION=13.11.0 \
-    GITLAB_WORKHORSE_VERSION=8.51.0 \
-    GITLAB_PAGES_VERSION=1.28.0 \
-    GITALY_SERVER_VERSION=13.5.4 \
+    GITLAB_SHELL_VERSION=13.13.0 \
+    GITLAB_WORKHORSE_VERSION=8.54.0 \
+    GITLAB_PAGES_VERSION=1.30.0 \
+    GITALY_SERVER_VERSION=13.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b2e7172b4..20990a44f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.5.4
+# sameersbn/gitlab:13.6.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.4
+docker pull sameersbn/gitlab:13.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.5.4
+ sameersbn/gitlab:13.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.5.4
+    sameersbn/gitlab:13.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:sanitize
+    sameersbn/gitlab:13.6.0 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake db:setup
+    sameersbn/gitlab:13.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.4
+docker pull sameersbn/gitlab:13.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.0
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ef52cf386..fc9c00c1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.4
+13.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index fbf90f15e..9f50a6e81 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d32932778..4f6972abc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a3aa80241..76d1c36cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 77492380b..90cbd53c8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.5.4
+docker pull sameersbn/gitlab:13.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.5.4
+sameersbn/gitlab:13.6.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f69a38a31..142dbd26b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7067c8b05..a27c1e5ef 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.5.4
+    image: sameersbn/gitlab:13.6.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7a64eabbe..9f46d5fa5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.5.4
+        image: sameersbn/gitlab:13.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From abb5d0e6c02878a99dbf98316ea9439f8dc41f08 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 23 Nov 2020 15:07:40 +0100
Subject: [PATCH 0569/1124] use bundler 2.1.4

---
 Changelog.md | 3 ++-
 Dockerfile   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0d26ea6bb..1acd27716 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,8 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitaly: upgrade v13.6.0
 - gitlab-shell: upgrade to v13.13.0
 - gitlab-pages: upgrade to v1.30.0
-- gitlab-workhorse: upgrade to v8.54.0    
+- gitlab-workhorse: upgrade to v8.54.0
+- use bundler 2.1.4
 
 **13.5.4**
 - gitlab: upgrade CE to v13.5.4
diff --git a/Dockerfile b/Dockerfile
index 3edeb6697..c56afaf7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN set -ex && \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
- && gem install --no-document bundler -v 1.17.3 \
+ && gem install --no-document bundler -v 2.1.4 \
  && rm -rf /var/lib/apt/lists/*
 
 COPY assets/build/ ${GITLAB_BUILD_DIR}/

From 9ef34bc35d051960bb342f88c946007a41a92d4b Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 23 Nov 2020 17:16:51 +0100
Subject: [PATCH 0570/1124] use ruby 2.7

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1acd27716..874269627 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab-pages: upgrade to v1.30.0
 - gitlab-workhorse: upgrade to v8.54.0
 - use bundler 2.1.4
+- use ruby 2.7
 
 **13.5.4**
 - gitlab: upgrade CE to v13.5.4
diff --git a/Dockerfile b/Dockerfile
index c56afaf7e..b2fddd792 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200921
 ARG VERSION=13.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.6 \
+    RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.15.5 \
     GITLAB_SHELL_VERSION=13.13.0 \
     GITLAB_WORKHORSE_VERSION=8.54.0 \

From b1b4e8a238d41568db1ff8863436b0cbb7d8ba0c Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Tue, 24 Nov 2020 13:45:33 +0100
Subject: [PATCH 0571/1124] upgrade Gitlab CE to 13.6.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 874269627..fce79ca25 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.6.1**
+- gitlab: upgrade CE to v13.6.1
+- gitaly: upgrade v13.6.1
+
 **13.6.0**
 - gitlab: upgrade CE to v13.6.0
 - gitaly: upgrade v13.6.0
diff --git a/Dockerfile b/Dockerfile
index b2fddd792..cf34c708e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.6.0
+ARG VERSION=13.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.13.0 \
     GITLAB_WORKHORSE_VERSION=8.54.0 \
     GITLAB_PAGES_VERSION=1.30.0 \
-    GITALY_SERVER_VERSION=13.6.0 \
+    GITALY_SERVER_VERSION=13.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 20990a44f..e0aa68874 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.6.0
+# sameersbn/gitlab:13.6.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.0
+docker pull sameersbn/gitlab:13.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.6.0
+ sameersbn/gitlab:13.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.6.0
+    sameersbn/gitlab:13.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:sanitize
+    sameersbn/gitlab:13.6.1 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake db:setup
+    sameersbn/gitlab:13.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.0
+docker pull sameersbn/gitlab:13.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.1
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fc9c00c1b..4daad9a5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.0
+13.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9f50a6e81..efd511f5b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4f6972abc..1d8f51ad0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 76d1c36cf..d0cad181b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 90cbd53c8..169915054 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.0
+docker pull sameersbn/gitlab:13.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.6.0
+sameersbn/gitlab:13.6.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 142dbd26b..2ed9576c6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a27c1e5ef..352a169ed 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.0
+    image: sameersbn/gitlab:13.6.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9f46d5fa5..23a8b000d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.6.0
+        image: sameersbn/gitlab:13.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 94a41b3ae22d015cffee6a6874006829337fabfd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 8 Dec 2020 19:30:54 +0100
Subject: [PATCH 0572/1124] upgrade Gitlab CE to 13.6.2

---
 Changelog.md                     |  4 +++
 Dockerfile                       |  4 +--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fce79ca25..f7f5d7a4e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.6.2**
+- gitlab: upgrade CE to v13.6.2
+- gitaly: upgrade v13.6.2
+
 **13.6.1**
 - gitlab: upgrade CE to v13.6.1
 - gitaly: upgrade v13.6.1
diff --git a/Dockerfile b/Dockerfile
index cf34c708e..7cc5517b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.6.1
+ARG VERSION=13.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.13.0 \
     GITLAB_WORKHORSE_VERSION=8.54.0 \
     GITLAB_PAGES_VERSION=1.30.0 \
-    GITALY_SERVER_VERSION=13.6.1 \
+    GITALY_SERVER_VERSION=13.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e0aa68874..aeda7ed8a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.6.1
+# sameersbn/gitlab:13.6.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.1
+docker pull sameersbn/gitlab:13.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.6.1
+ sameersbn/gitlab:13.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.6.1
+    sameersbn/gitlab:13.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:sanitize
+    sameersbn/gitlab:13.6.2 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake db:setup
+    sameersbn/gitlab:13.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.1
+docker pull sameersbn/gitlab:13.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.2
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4daad9a5c..c4d83dcde 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.1
+13.6.2
diff --git a/docker-compose.yml b/docker-compose.yml
index d0cad181b..90274d088 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 169915054..1887e6d4e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.1
+docker pull sameersbn/gitlab:13.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.6.1
+sameersbn/gitlab:13.6.2
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 352a169ed..4804ceeba 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.6.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 23a8b000d..747426d64 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.6.1
+        image: sameersbn/gitlab:13.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From a0a3af5b6569eaed372d9d443fe2c112f4c2e8bd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 8 Dec 2020 19:39:34 +0100
Subject: [PATCH 0573/1124] remove unnecessary package lists

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7cc5517b2..cd45f111f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,9 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-      wget ca-certificates apt-transport-https gnupg2
+    wget ca-certificates apt-transport-https gnupg2 \
+ && rm -rf /var/lib/apt/lists/*
+
 RUN set -ex && \
  apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
  && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" >> /etc/apt/sources.list \

From e95c3b744af2ed0302424c40c049717630522b67 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 8 Dec 2020 19:50:58 +0100
Subject: [PATCH 0574/1124] go release 1.15.6

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

diff --git a/Dockerfile b/Dockerfile
index cd45f111f..a156d1cb1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=13.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.15.5 \
+    GOLANG_VERSION=1.15.6 \
     GITLAB_SHELL_VERSION=13.13.0 \
     GITLAB_WORKHORSE_VERSION=8.54.0 \
     GITLAB_PAGES_VERSION=1.30.0 \

From 78e909cd88089bdcf37853aba98bb67e67f7db22 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 13 Dec 2020 11:51:55 +0100
Subject: [PATCH 0575/1124] upgrade Gitlab CE to 13.6.3

---
 Changelog.md                     |  4 +++
 Dockerfile                       |  4 +--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f7f5d7a4e..831bff9a8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.6.3**
+- gitlab: upgrade CE to v13.6.3
+- gitaly: upgrade v13.6.3
+
 **13.6.2**
 - gitlab: upgrade CE to v13.6.2
 - gitaly: upgrade v13.6.2
diff --git a/Dockerfile b/Dockerfile
index a156d1cb1..b77803e70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.6.2
+ARG VERSION=13.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.13.0 \
     GITLAB_WORKHORSE_VERSION=8.54.0 \
     GITLAB_PAGES_VERSION=1.30.0 \
-    GITALY_SERVER_VERSION=13.6.2 \
+    GITALY_SERVER_VERSION=13.6.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index aeda7ed8a..8c7968ad8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.6.2
+# sameersbn/gitlab:13.6.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.2
+docker pull sameersbn/gitlab:13.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.6.2
+ sameersbn/gitlab:13.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.6.2
+    sameersbn/gitlab:13.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:sanitize
+    sameersbn/gitlab:13.6.3 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake db:setup
+    sameersbn/gitlab:13.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.2
+docker pull sameersbn/gitlab:13.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.3
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.6.2
+    image: sameersbn/gitlab:13.6.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c4d83dcde..b550f7448 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.2
+13.6.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 90274d088..82b8abec3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.2
+    image: sameersbn/gitlab:13.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1887e6d4e..97cf437e1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.2
+docker pull sameersbn/gitlab:13.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.6.2
+sameersbn/gitlab:13.6.3
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4804ceeba..58b7562e1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.2
+    image: sameersbn/gitlab:13.6.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 747426d64..f53134b4a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.6.2
+        image: sameersbn/gitlab:13.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 283bd540f12b3d16ced53bc00fbaae251a0b1157 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 26 Dec 2020 12:39:10 +0100
Subject: [PATCH 0576/1124] upgrade Gitlab CE to 13.7.0

Signed-off-by: solidnerd <niclas@mietz.io>

# Conflicts:
#	Changelog.md
#	Dockerfile
#	README.md
#	VERSION
#	docker-compose.yml
#	docs/container_registry.md
#	docs/docker-compose-registry.yml
#	kubernetes/gitlab-rc.yml
---
 Changelog.md                     |  7 ++++
 Dockerfile                       | 10 +++---
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 831bff9a8..7676ad4a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.7.0**
+- gitlab: upgrade CE to v13.7.0
+- gitaly: upgrade v13.7.0
+- gitlab-shell: upgrade to 13.14.0
+- gitlab-pages: upgrade to v1.32.0
+- gitlab-workhorse: upgrade to v8.58.0
+
 **13.6.3**
 - gitlab: upgrade CE to v13.6.3
 - gitaly: upgrade v13.6.3
diff --git a/Dockerfile b/Dockerfile
index b77803e70..ae67d51d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20200921
 
-ARG VERSION=13.6.3
+ARG VERSION=13.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.15.6 \
-    GITLAB_SHELL_VERSION=13.13.0 \
-    GITLAB_WORKHORSE_VERSION=8.54.0 \
-    GITLAB_PAGES_VERSION=1.30.0 \
-    GITALY_SERVER_VERSION=13.6.3 \
+    GITLAB_SHELL_VERSION=13.14.0 \
+    GITLAB_WORKHORSE_VERSION=8.58.0 \
+    GITLAB_PAGES_VERSION=1.32.0 \
+    GITALY_SERVER_VERSION=13.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8c7968ad8..866817078 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.6.3
+# sameersbn/gitlab:13.7.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.3
+docker pull sameersbn/gitlab:13.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.6.3
+ sameersbn/gitlab:13.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.6.3
+    sameersbn/gitlab:13.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:sanitize
+    sameersbn/gitlab:13.7.0 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake db:setup
+    sameersbn/gitlab:13.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.3
+docker pull sameersbn/gitlab:13.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.0
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.6.3
+    image: sameersbn/gitlab:13.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b550f7448..d6ef99820 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.3
+13.7.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 82b8abec3..e6877cd9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.3
+    image: sameersbn/gitlab:13.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 97cf437e1..04815a7b9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.6.3
+docker pull sameersbn/gitlab:13.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.6.3
+sameersbn/gitlab:13.7.0
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 58b7562e1..1d9be86af 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.3
+    image: sameersbn/gitlab:13.7.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f53134b4a..a3dd1b667 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.6.3
+        image: sameersbn/gitlab:13.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ec81aa33d45013cc89baf6d4d61c3539f193d0b7 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 22 Dec 2020 19:09:06 +0100
Subject: [PATCH 0577/1124] build from ubuntu:bionic-20201119

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 7676ad4a0..3ba17c9fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab-shell: upgrade to 13.14.0
 - gitlab-pages: upgrade to v1.32.0
 - gitlab-workhorse: upgrade to v8.58.0
+- ubuntu: upgrade to ubuntu bionic-20201119
 
 **13.6.3**
 - gitlab: upgrade CE to v13.6.3
diff --git a/Dockerfile b/Dockerfile
index ae67d51d2..fc64c1195 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200921
+FROM ubuntu:bionic-20201119
 
 ARG VERSION=13.7.0
 

From ca34ea04866b91653bc6494afce3a12be6657b7c Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 26 Dec 2020 12:35:03 +0100
Subject: [PATCH 0578/1124]  fix: GITLAB_RELATIVE_URL_ROOT installation method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During the last remove of the node_modules folder it wasn’t possbile to recompile assets on the start of the container. This is neccesarry for the GITLAB_RELATIVE_URL_ROOT to work correctly.

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Dockerfile               | 2 +-
 assets/runtime/functions | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fc64c1195..5279f6e12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,7 +79,7 @@ LABEL \
 
 EXPOSE 22/tcp 80/tcp 443/tcp
 
-VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"]
+VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"]
 WORKDIR ${GITLAB_INSTALL_DIR}
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 CMD ["app:start"]
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 663d26b48..6eb19ecf5 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1806,6 +1806,14 @@ migrate_database() {
   if [[ ! -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT || ${GITLAB_RELATIVE_URL_ROOT} != ${CACHE_GITLAB_RELATIVE_URL_ROOT} ]]; then
     # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used
     if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
+      if [[ ! -d ${GITLAB_HOME}/gitlab/node_modules ]]; then
+        mkdir -p ${GITLAB_HOME}/gitlab/node_modules
+        chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
+      fi
+      echo "Prepare recomplie assets... Installing missing node_modules for assets"
+      chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
+      exec_as_git yarn install --production --pure-lockfile
+      exec_as_git yarn add ajv@^4.0.0
       echo "Recompiling assets (relative_url in use), this could take a while..."
       exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
     fi

From 52cfe8b8af93b7b838e0f427edeed25926e72d88 Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Sat, 26 Dec 2020 12:44:10 +0100
Subject: [PATCH 0579/1124] chore: upgrade to postgres 12

Signed-off-by: solidnerd <niclas@mietz.io>
---
 Changelog.md                            | 1 +
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docker-compose.swarm.yml                | 2 +-
 docker-compose.yml                      | 2 +-
 docs/docker-compose-keycloak.yml        | 2 +-
 docs/docker-compose-registry.yml        | 2 +-
 kubernetes/postgresql-rc.yml            | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3ba17c9fe..a8578bd50 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - gitlab-pages: upgrade to v1.32.0
 - gitlab-workhorse: upgrade to v8.58.0
 - ubuntu: upgrade to ubuntu bionic-20201119
+- postgresql: upgrade to postgresql 12
 
 **13.6.3**
 - gitlab: upgrade CE to v13.6.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index efd511f5b..64019cbbc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:11-20200524
+    image: sameersbn/postgresql:12-20200524
     volumes:
     - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1d8f51ad0..18ad24e0e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:11-20200524
+    image: sameersbn/postgresql:12-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index e6877cd9a..affddf0f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:11-20200524
+    image: sameersbn/postgresql:12-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 2ed9576c6..38f1dcb3c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:11-20200524
+    image: sameersbn/postgresql:12-20200524
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1d9be86af..d02428015 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:11-20200524
+    image: sameersbn/postgresql:12-20200524
     volumes:
     - postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index de00601e2..dee508791 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:11-20200524
+        image: sameersbn/postgresql:12-20200524
         env:
         - name: DB_USER
           value: gitlab

From cd339fea288171a9b46a2669ddc2138d5a8266d2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 25 Dec 2020 18:50:51 +0100
Subject: [PATCH 0580/1124] Use PostgreSQL 12

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 866817078..45ad6ebe5 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:11-20200524
+    sameersbn/postgresql:12-20200524
 ```
 
 Step 2. Launch a redis container
@@ -275,7 +275,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, lets pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:11-20200524
+docker pull sameersbn/postgresql:12-20200524
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -295,7 +295,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:11-20200524
+    sameersbn/postgresql:12-20200524
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -1288,7 +1288,7 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:11-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
+> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 

From 9077bbb48f3e65511b55ace65cd4f174a6703cba Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 25 Dec 2020 09:28:54 +0100
Subject: [PATCH 0581/1124] upgrade Gitlab CE to 13.7.1

---
 Changelog.md                     |  4 +++
 Dockerfile                       |  4 +--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a8578bd50..86f4acdc6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.7.1**
+- gitlab: upgrade CE to v13.7.1
+- gitaly: upgrade v13.7.1
+
 **13.7.0**
 - gitlab: upgrade CE to v13.7.0
 - gitaly: upgrade v13.7.0
diff --git a/Dockerfile b/Dockerfile
index 5279f6e12..cb3554479 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20201119
 
-ARG VERSION=13.7.0
+ARG VERSION=13.7.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.14.0 \
     GITLAB_WORKHORSE_VERSION=8.58.0 \
     GITLAB_PAGES_VERSION=1.32.0 \
-    GITALY_SERVER_VERSION=13.7.0 \
+    GITALY_SERVER_VERSION=13.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 45ad6ebe5..edf34a805 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.7.0
+# sameersbn/gitlab:13.7.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.0
+docker pull sameersbn/gitlab:13.7.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 ## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 ### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 ### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.7.0
+ sameersbn/gitlab:13.7.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.7.0
+    sameersbn/gitlab:13.7.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:sanitize
+    sameersbn/gitlab:13.7.1 app:sanitize
 ```
 
 ### Piwik
@@ -1129,7 +1129,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1164,14 +1164,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake db:setup
+    sameersbn/gitlab:13.7.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.7.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.0
+docker pull sameersbn/gitlab:13.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.1
 ```
 
 ## Shell Access
@@ -1365,7 +1365,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.7.0
+    image: sameersbn/gitlab:13.7.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d6ef99820..06e5e084c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.0
+13.7.1
diff --git a/docker-compose.yml b/docker-compose.yml
index affddf0f2..b1c700066 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.0
+    image: sameersbn/gitlab:13.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 04815a7b9..013c83946 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.0
+docker pull sameersbn/gitlab:13.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.7.0
+sameersbn/gitlab:13.7.1
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d02428015..7e96be8b7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.0
+    image: sameersbn/gitlab:13.7.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a3dd1b667..4b9012dc2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.7.0
+        image: sameersbn/gitlab:13.7.1
         env:
         - name: TZ
           value: Asia/Kolkata

From bb7bc3f0ae137579a07854794ab31f73fdd3ca7e Mon Sep 17 00:00:00 2001
From: tomastzn <33376457+tomastzn@users.noreply.github.com>
Date: Wed, 30 Dec 2020 18:33:09 -0500
Subject: [PATCH 0582/1124] Add info about PostgreSQL upgrade

This change adds more information about upgrading PostgreSQL used with this image.
---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index edf34a805..ec225920a 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@
         - [PostgreSQL (Recommended)](#postgresql)
             - [External PostgreSQL Server](#external-postgresql-server)
             - [Linking to PostgreSQL Container](#linking-to-postgresql-container)
+            - [Upgrading PostgreSQL](#upgrading-postgresql)
     - [Redis](#redis)
         - [Internal Redis Server](#internal-redis-server)
         - [External Redis Server](#external-redis-server)
@@ -239,6 +240,8 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 ### PostgreSQL
 
+*NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x
+
 #### External PostgreSQL Server
 
 The image also supports using an external PostgreSQL Server. This is also controlled via environment variables.
@@ -315,6 +318,18 @@ Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PA
  - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
  - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
 
+#### Upgrading PostgreSQL
+
+When this Gitlab image upgrades its dependency on specific version of PostgreSQL you will need to make sure to use corresponding version of PostgreSQL.
+
+If you are setting a brand new install, there is no data migration involved. However, if you already have an existing setup, the PostgreSQL data will need to be migrated as you are upgrading the version of PostgreSQL.
+
+If you are using PostgreSQL image other than [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) you will need make sure that the image you are using can handle migration itself, **or**, you will need to migrate the data yourself before starting newer version of PostgreSQL.
+
+Following project provides Docker image that handles migration of PostgreSQL data: [tianon/postgres-upgrade](https://hub.docker.com/r/tianon/postgres-upgrade/)
+
+After migration of the data, verify that other PostgreSQL configuration files in its data folder are copied over as well. One such file is `pg_hba.conf`, it will need to be copied from old version data folder into new version data folder.
+
 ## Redis
 
 GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables.
@@ -1289,6 +1304,8 @@ Usage when using `docker-compose` can also be found there.
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
 > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
+> 
+> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). 
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 

From 7d852590e4d0f73d055f7f7f9eac440bb3e4ea9d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 8 Jan 2021 20:34:28 +0100
Subject: [PATCH 0583/1124] upgrade Gitlab CE to 13.7.1

---
 Changelog.md                     |  8 ++++-
 Dockerfile                       |  8 ++---
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 86f4acdc6..950b406e4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.7.3**
+- gitlab: upgrade CE to v13.7.3
+- gitlab-pages: upgrade to v1.34.0
+- gitlab-shell: upgrade to c13.7.3
+- gitlab-workhorse: upgrade to v8.58.2
+
 **13.7.1**
 - gitlab: upgrade CE to v13.7.1
 - gitaly: upgrade v13.7.1
@@ -10,7 +16,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 **13.7.0**
 - gitlab: upgrade CE to v13.7.0
 - gitaly: upgrade v13.7.0
-- gitlab-shell: upgrade to 13.14.0
+- gitlab-shell: upgrade to v13.14.0
 - gitlab-pages: upgrade to v1.32.0
 - gitlab-workhorse: upgrade to v8.58.0
 - ubuntu: upgrade to ubuntu bionic-20201119
diff --git a/Dockerfile b/Dockerfile
index cb3554479..92a0cfbe0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20201119
 
-ARG VERSION=13.7.1
+ARG VERSION=13.7.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.15.6 \
     GITLAB_SHELL_VERSION=13.14.0 \
-    GITLAB_WORKHORSE_VERSION=8.58.0 \
-    GITLAB_PAGES_VERSION=1.32.0 \
-    GITALY_SERVER_VERSION=13.7.1 \
+    GITLAB_WORKHORSE_VERSION=8.58.2 \
+    GITLAB_PAGES_VERSION=1.34.0 \
+    GITALY_SERVER_VERSION=13.7.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ec225920a..165f77f3a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.7.1
+# sameersbn/gitlab:13.7.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.1
+docker pull sameersbn/gitlab:13.7.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.7.1
+ sameersbn/gitlab:13.7.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.7.1
+    sameersbn/gitlab:13.7.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:sanitize
+    sameersbn/gitlab:13.7.3 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake db:setup
+    sameersbn/gitlab:13.7.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.7.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.1
+docker pull sameersbn/gitlab:13.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.3
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.7.1
+    image: sameersbn/gitlab:13.7.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 06e5e084c..f74186a78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.1
+13.7.3
diff --git a/docker-compose.yml b/docker-compose.yml
index b1c700066..e1e1fad29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.1
+    image: sameersbn/gitlab:13.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 013c83946..f14884502 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.1
+docker pull sameersbn/gitlab:13.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.7.1
+sameersbn/gitlab:13.7.3
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7e96be8b7..64fde5226 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.1
+    image: sameersbn/gitlab:13.7.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4b9012dc2..acbacbca1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.7.1
+        image: sameersbn/gitlab:13.7.3
         env:
         - name: TZ
           value: Asia/Kolkata

From c3228c20e3c1bbda3cfc882f50a3ea0dfd3e06b1 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Thu, 14 Jan 2021 19:48:43 +0100
Subject: [PATCH 0584/1124] upgrade Gitlab CE to 13.7.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 950b406e4..f6a79d8c5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+
+**13.7.4**
+- gitlab: upgrade CE to v13.7.4
+
 **13.7.3**
 - gitlab: upgrade CE to v13.7.3
 - gitlab-pages: upgrade to v1.34.0
diff --git a/Dockerfile b/Dockerfile
index 92a0cfbe0..578bb952d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20201119
 
-ARG VERSION=13.7.3
+ARG VERSION=13.7.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.14.0 \
     GITLAB_WORKHORSE_VERSION=8.58.2 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.7.3 \
+    GITALY_SERVER_VERSION=13.7.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 165f77f3a..ab0585051 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.7.3
+# sameersbn/gitlab:13.7.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.3
+docker pull sameersbn/gitlab:13.7.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.7.3
+ sameersbn/gitlab:13.7.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.7.3
+    sameersbn/gitlab:13.7.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:sanitize
+    sameersbn/gitlab:13.7.4 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake db:setup
+    sameersbn/gitlab:13.7.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.7.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.3
+docker pull sameersbn/gitlab:13.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.4
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.7.3
+    image: sameersbn/gitlab:13.7.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f74186a78..59abc5978 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.3
+13.7.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 64019cbbc..9453d2c60 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 18ad24e0e..d96a93f23 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e1e1fad29..1c9f385d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.3
+    image: sameersbn/gitlab:13.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f14884502..1db06b96f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.3
+docker pull sameersbn/gitlab:13.7.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.7.3
+sameersbn/gitlab:13.7.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 38f1dcb3c..b3ee20b74 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.6.1
+    image: sameersbn/gitlab:13.7.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 64fde5226..fdaa19363 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.3
+    image: sameersbn/gitlab:13.7.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index acbacbca1..c34529c40 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.7.3
+        image: sameersbn/gitlab:13.7.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 4003641f27910a6ad0e2675fc810339db4615128 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 23 Jan 2021 11:59:48 +0100
Subject: [PATCH 0585/1124] upgrade Gitlab CE to 13.8.0

---
 Changelog.md                     | 10 +++++-
 Dockerfile                       | 12 +++----
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f6a79d8c5..c42ad738c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.8.0**
+- gitlab: upgrade CE to v13.8.0
+- gitaly: upgrade v13.8.0
+- gitlab-shell: upgrade to v13.15.0
+- gitlab-workhorse: upgrade to v8.59.0
+- gitlab-pages: upgrade to v1.34.0
+- golang: upgrade to v1.15.7
+- ubuntu: upgrade to bionic-20210118
 
 **13.7.4**
 - gitlab: upgrade CE to v13.7.4
@@ -10,7 +18,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 **13.7.3**
 - gitlab: upgrade CE to v13.7.3
 - gitlab-pages: upgrade to v1.34.0
-- gitlab-shell: upgrade to c13.7.3
+- gitlab-shell: upgrade to v13.7.3
 - gitlab-workhorse: upgrade to v8.58.2
 
 **13.7.1**
diff --git a/Dockerfile b/Dockerfile
index 578bb952d..3379acae1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:bionic-20201119
+FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.7.4
+ARG VERSION=13.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.15.6 \
-    GITLAB_SHELL_VERSION=13.14.0 \
-    GITLAB_WORKHORSE_VERSION=8.58.2 \
+    GOLANG_VERSION=1.15.7 \
+    GITLAB_SHELL_VERSION=13.15.0 \
+    GITLAB_WORKHORSE_VERSION=8.59.0 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.7.4 \
+    GITALY_SERVER_VERSION=13.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ab0585051..9d5c890bb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.7.4
+# sameersbn/gitlab:13.8.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.4
+docker pull sameersbn/gitlab:13.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.7.4
+ sameersbn/gitlab:13.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.7.4
+    sameersbn/gitlab:13.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:sanitize
+    sameersbn/gitlab:13.8.0 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake db:setup
+    sameersbn/gitlab:13.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.4
+docker pull sameersbn/gitlab:13.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.0
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 59abc5978..447269552 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.4
+13.8.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c9f385d5..9b51696bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1db06b96f..77c5cd559 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.7.4
+docker pull sameersbn/gitlab:13.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.7.4
+sameersbn/gitlab:13.8.0
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fdaa19363..b0bbee85e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c34529c40..4900ade85 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.7.4
+        image: sameersbn/gitlab:13.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 5bdb02fab234153c1387ef2da6e0ccfb0dae681b Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Tue, 26 Jan 2021 15:08:19 +0100
Subject: [PATCH 0586/1124] upgrade Gitlab CE to 13.8.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c42ad738c..e9e61a110 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.8.1**
+- gitlab: upgrade CE to v13.8.1
+- gitaly: upgrade v13.8.1
+
 **13.8.0**
 - gitlab: upgrade CE to v13.8.0
 - gitaly: upgrade v13.8.0
diff --git a/Dockerfile b/Dockerfile
index 3379acae1..39b8a172b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.8.0
+ARG VERSION=13.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.15.0 \
     GITLAB_WORKHORSE_VERSION=8.59.0 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.8.0 \
+    GITALY_SERVER_VERSION=13.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9d5c890bb..14c8247e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.8.0
+# sameersbn/gitlab:13.8.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.0
+docker pull sameersbn/gitlab:13.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.8.0
+ sameersbn/gitlab:13.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.8.0
+    sameersbn/gitlab:13.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:sanitize
+    sameersbn/gitlab:13.8.1 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake db:setup
+    sameersbn/gitlab:13.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.0
+docker pull sameersbn/gitlab:13.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.1
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.8.0
+    image: sameersbn/gitlab:13.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 447269552..44486feca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.0
+13.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9453d2c60..10d0d065d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d96a93f23..d38f0cfe9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b51696bb..92fbd3809 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.0
+    image: sameersbn/gitlab:13.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 77c5cd559..1ea48317d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.0
+docker pull sameersbn/gitlab:13.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.8.0
+sameersbn/gitlab:13.8.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b3ee20b74..167ada2b1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.7.4
+    image: sameersbn/gitlab:13.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b0bbee85e..be6bdd470 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.0
+    image: sameersbn/gitlab:13.8.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4900ade85..32de1f3e0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.8.0
+        image: sameersbn/gitlab:13.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From cd85150edaf8d73dc2d476253f686736aeb2a62a Mon Sep 17 00:00:00 2001
From: Michael Joseph Walsh <github.com@nemonik.com>
Date: Thu, 14 Jan 2021 14:48:10 -0500
Subject: [PATCH 0587/1124] Update keycloak-idp.md

Correction to the documentation to address #2282.
---
 docs/keycloak-idp.md | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 23f3eb08d..80f1013e7 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -26,6 +26,9 @@ Next, click save, get the client secret generated by Keycloak and start filling
 
 ![Keycloak client secret](images/keycloak-secret.png)
 
+Set the following in the docker-compose file:
+
+
 ```yaml
     - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
     - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
@@ -35,7 +38,19 @@ Next, click save, get the client secret generated by Keycloak and start filling
     - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
 ```
 
-Make sure the following variables are filled in the docker-compose file:
+`<your-ip-address>` is the IP address of your keycloak for this example this would be your IP address, but if your Keycloak existed elsewhere `<your-ip-address>` would be different for your deployment as would the port and the realm. 
+
+The following must also be configured:
+
+``yaml
+    - OAUTH2_GENERIC_USER_UID='username'
+    - OAUTH2_GENERIC_USER_NAME='full name'
+    - OAUTH2_GENERIC_USER_EMAIL='email'    
+```
+
+The values set may be different for your deployment.
+
+Also, make sure the following variables are filled in the docker-compose file:
 
 ```yaml
     - GITLAB_HOST='<your-ip-address>'
@@ -46,9 +61,10 @@ Make sure the following variables are filled in the docker-compose file:
     - OAUTH_BLOCK_AUTO_CREATED_USERS=false
     - OAUTH_AUTO_LINK_LDAP_USER=false
     - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=Keycloak
 ```
 
+`<your-ip-address>` is the IP address of your GitLAB for this exampke this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `<your-ip-address>` would be another value appropriate for your deployment.
+
 GitLab does not allow login from users in Keycloak with an empty email or name. To prevent this, you can create a new user in Keycloak or you can add email and name for the admin account.
 
 Visit the `Users` tab and click on `View all users` to modify the Admin user.
@@ -62,4 +78,4 @@ Deploy GitLab, Reddis and PostgreSQL by running the following command: `docker-c
 
 You can now login on the local GitLab instance with with Keycloak on your [local IP](http://localhost:10080).
 
-![gitlab-login](images/keycloak-gitlab-login.png)
\ No newline at end of file
+![gitlab-login](images/keycloak-gitlab-login.png)

From ac51dc02bad7552dbf1ca7ed21b605446d0a35c4 Mon Sep 17 00:00:00 2001
From: Michael Joseph Walsh <github.com@nemonik.com>
Date: Thu, 14 Jan 2021 14:48:40 -0500
Subject: [PATCH 0588/1124] Update keycloak-idp.md

---
 docs/keycloak-idp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 80f1013e7..4f238a406 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -42,7 +42,7 @@ Set the following in the docker-compose file:
 
 The following must also be configured:
 
-``yaml
+```yaml
     - OAUTH2_GENERIC_USER_UID='username'
     - OAUTH2_GENERIC_USER_NAME='full name'
     - OAUTH2_GENERIC_USER_EMAIL='email'    

From 3eaf1671ff03408663836bda8d51835a5624fca9 Mon Sep 17 00:00:00 2001
From: Michael Joseph Walsh <github.com@nemonik.com>
Date: Sat, 16 Jan 2021 17:38:00 -0500
Subject: [PATCH 0589/1124] Update keycloak-idp.md

Typos corrected.
---
 docs/keycloak-idp.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 4f238a406..c6d2b898e 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -38,7 +38,7 @@ Set the following in the docker-compose file:
     - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
 ```
 
-`<your-ip-address>` is the IP address of your keycloak for this example this would be your IP address, but if your Keycloak existed elsewhere `<your-ip-address>` would be different for your deployment as would the port and the realm. 
+`<your-ip-address>` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `<your-ip-address>` would be different as would the port and the realm. 
 
 The following must also be configured:
 
@@ -63,7 +63,7 @@ Also, make sure the following variables are filled in the docker-compose file:
     - OAUTH_AUTO_LINK_SAML_USER=false
 ```
 
-`<your-ip-address>` is the IP address of your GitLAB for this exampke this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `<your-ip-address>` would be another value appropriate for your deployment.
+`<your-ip-address>` is the IP address of your GitLab for this example this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `<your-ip-address>` would be another value appropriate for your deployment.
 
 GitLab does not allow login from users in Keycloak with an empty email or name. To prevent this, you can create a new user in Keycloak or you can add email and name for the admin account.
 

From d718d933954af8f1f2265bc5e243b340d4952e41 Mon Sep 17 00:00:00 2001
From: Michael Joseph Walsh <github.com@nemonik.com>
Date: Wed, 20 Jan 2021 15:48:19 -0500
Subject: [PATCH 0590/1124] Update keycloak-idp.md

Added more on the values needed.
---
 docs/keycloak-idp.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index c6d2b898e..37d11ab4e 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -43,12 +43,13 @@ Set the following in the docker-compose file:
 The following must also be configured:
 
 ```yaml
-    - OAUTH2_GENERIC_USER_UID='username'
-    - OAUTH2_GENERIC_USER_NAME='full name'
+    - OAUTH2_GENERIC_USER_UID='preffered_usename'
+    - OAUTH2_GENERIC_USER_NAME='name'
     - OAUTH2_GENERIC_USER_EMAIL='email'    
 ```
 
-The values set may be different for your deployment.
+The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. 
+
 
 Also, make sure the following variables are filled in the docker-compose file:
 

From f6750c56770d248f961515c7d31bc013703230bd Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 1 Feb 2021 23:33:40 +0100
Subject: [PATCH 0591/1124] upgrade Gitlab CE to 13.8.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e9e61a110..cc1cd9a89 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.8.2**
+- gitlab: upgrade CE to v13.8.2
+- gitaly: upgrade v13.8.2
+
 **13.8.1**
 - gitlab: upgrade CE to v13.8.1
 - gitaly: upgrade v13.8.1
diff --git a/Dockerfile b/Dockerfile
index 39b8a172b..415fa2f36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.8.1
+ARG VERSION=13.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.15.0 \
     GITLAB_WORKHORSE_VERSION=8.59.0 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.8.1 \
+    GITALY_SERVER_VERSION=13.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 14c8247e3..2704c1668 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.8.1
+# sameersbn/gitlab:13.8.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.1
+docker pull sameersbn/gitlab:13.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.8.1
+ sameersbn/gitlab:13.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.8.1
+    sameersbn/gitlab:13.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:sanitize
+    sameersbn/gitlab:13.8.2 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake db:setup
+    sameersbn/gitlab:13.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.1
+docker pull sameersbn/gitlab:13.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.2
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 44486feca..b8a1cf372 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.1
+13.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 10d0d065d..af74ec6de 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d38f0cfe9..1a085ceea 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 92fbd3809..bb0479b50 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1ea48317d..23e6d3298 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.1
+docker pull sameersbn/gitlab:13.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.8.1
+sameersbn/gitlab:13.8.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 167ada2b1..cf41609c3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index be6bdd470..3053c7d85 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.1
+    image: sameersbn/gitlab:13.8.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 32de1f3e0..9b4c42c9f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.8.1
+        image: sameersbn/gitlab:13.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 30883516e0eaa0a9676cfb955bda347b2cd83a81 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 6 Feb 2021 10:24:38 +0100
Subject: [PATCH 0592/1124] upgrade Gitlab CE to 13.8.3

---
 Changelog.md                     |  5 +++
 Dockerfile                       |  6 ++--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cc1cd9a89..4160fdfec 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.8.3**
+- gitlab: upgrade CE to v13.8.3
+- gitaly: upgrade v13.8.3
+- golang: upgrade to v1.15.8
+
 **13.8.2**
 - gitlab: upgrade CE to v13.8.2
 - gitaly: upgrade v13.8.2
diff --git a/Dockerfile b/Dockerfile
index 415fa2f36..7b8b80c26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.8.2
+ARG VERSION=13.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.15.7 \
+    GOLANG_VERSION=1.15.8 \
     GITLAB_SHELL_VERSION=13.15.0 \
     GITLAB_WORKHORSE_VERSION=8.59.0 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.8.2 \
+    GITALY_SERVER_VERSION=13.8.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2704c1668..8b54fe5fc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.8.2
+# sameersbn/gitlab:13.8.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.2
+docker pull sameersbn/gitlab:13.8.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.8.2
+ sameersbn/gitlab:13.8.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.8.2
+    sameersbn/gitlab:13.8.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:sanitize
+    sameersbn/gitlab:13.8.3 app:sanitize
 ```
 
 ### Piwik
@@ -1144,7 +1144,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1179,14 +1179,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake db:setup
+    sameersbn/gitlab:13.8.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.8.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.2
+docker pull sameersbn/gitlab:13.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.3
 ```
 
 ## Shell Access
@@ -1382,7 +1382,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.8.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b8a1cf372..5d32a7569 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.2
+13.8.3
diff --git a/docker-compose.yml b/docker-compose.yml
index bb0479b50..c6f349204 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 23e6d3298..f681c1509 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.2
+docker pull sameersbn/gitlab:13.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.8.2
+sameersbn/gitlab:13.8.3
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 3053c7d85..555a9c490 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.8.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9b4c42c9f..e8cca3c1a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.8.2
+        image: sameersbn/gitlab:13.8.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 83202cdf6af241443592ab9623bd630ee29ca334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BA=A6=E5=BD=93=E8=8B=97=E5=84=BF?=
 <zuojiazi.cn@gmail.com>
Date: Tue, 16 Feb 2021 16:21:06 +0900
Subject: [PATCH 0593/1124] added `SSL_PROTOCOLS` option to change protocols of
 the nginx (#2304)

---
 Changelog.md                                 | 7 +++++++
 README.md                                    | 9 +++++++--
 assets/runtime/config/nginx/gitlab-pages-ssl | 4 ++--
 assets/runtime/config/nginx/gitlab-registry  | 4 ++--
 assets/runtime/config/nginx/gitlab-ssl       | 4 ++--
 assets/runtime/env-defaults                  | 5 +++++
 assets/runtime/functions                     | 9 +++++++--
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4160fdfec..4a4c5ce65 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.8.3-1**
+- added `SSL_PROTOCOLS` option to change protocols of the nginx
+- added `SSL_REGISTRY_CIPHERS`
+- added `SSL_REGISTRY_PROTOCOLS`
+- added `SSL_PAGES_CIPHERS`
+- added `SSL_PAGES_PROTOCOLS`
+
 **13.8.3**
 - gitlab: upgrade CE to v13.8.3
 - gitaly: upgrade v13.8.3
diff --git a/README.md b/README.md
index 8b54fe5fc..42f872990 100644
--- a/README.md
+++ b/README.md
@@ -935,6 +935,11 @@ Below is the complete list of available options that can be used to customize yo
 | `SSL_PAGES_KEY_PATH` | Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` |
 | `SSL_PAGES_CERT_PATH` | Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` |
 | `SSL_CIPHERS` | List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` |
+| `SSL_PROTOCOLS` | List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` |
+| `SSL_PAGES_CIPHERS` | List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` |
+| `SSL_PAGES_PROTOCOLS` | List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` |
+| `SSL_REGISTRY_CIPHERS` | List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` |
+| `SSL_REGISTRY_PROTOCOLS` | List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` |
 | `NGINX_WORKERS` | The number of nginx workers to start. Defaults to `1`. |
 | `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` | Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. |
 | `NGINX_HSTS_ENABLED` | Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. |
@@ -1304,8 +1309,8 @@ Usage when using `docker-compose` can also be found there.
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
 > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
-> 
-> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). 
+>
+> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 
diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl
index dba9f0a2e..d18956d3c 100644
--- a/assets/runtime/config/nginx/gitlab-pages-ssl
+++ b/assets/runtime/config/nginx/gitlab-pages-ssl
@@ -35,8 +35,8 @@ server {
   ssl_certificate_key {{SSL_PAGES_KEY_PATH}};
 
   # GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs
-  ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers "{{SSL_PAGES_CIPHERS}}";
+  ssl_protocols {{SSL_PAGES_PROTOCOLS}};
   ssl_prefer_server_ciphers on;
   ssl_session_cache shared:SSL:10m;
   ssl_session_timeout 5m;
diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index 562b37ef2..280436561 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -30,8 +30,8 @@ server {
   ssl_certificate {{SSL_REGISTRY_CERT_PATH}};
   ssl_certificate_key {{SSL_REGISTRY_KEY_PATH}};
 
-  ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4';
-  ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers "{{SSL_REGISTRY_CIPHERS}}";
+  ssl_protocols {{SSL_REGISTRY_PROTOCOLS}};
   ssl_prefer_server_ciphers on;
   ssl_session_cache  builtin:1000  shared:SSL:10m;
   ssl_session_timeout  5m;
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 24acfe171..79bd0966e 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -60,7 +60,7 @@ server {
 
   # GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs
   ssl_ciphers "{{SSL_CIPHERS}}";
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_protocols {{SSL_PROTOCOLS}};
   ssl_prefer_server_ciphers on;
   ssl_session_cache shared:SSL:10m;
   ssl_session_timeout 5m;
@@ -117,7 +117,7 @@ server {
     proxy_set_header    X-Forwarded-Proto   {{NGINX_X_FORWARDED_PROTO}};
     proxy_set_header    Upgrade             $http_upgrade;
     proxy_set_header    Connection          $connection_upgrade_gitlab_ssl;
-    
+
     proxy_pass http://gitlab-workhorse;
   }
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 4a1c65bb1..14b0d4148 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -214,14 +214,19 @@ SSL_KEY_PATH=${SSL_KEY_PATH:-$GITLAB_DATA_DIR/certs/gitlab.key}
 SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-$GITLAB_DATA_DIR/certs/dhparam.pem}
 SSL_VERIFY_CLIENT=${SSL_VERIFY_CLIENT:-off}
 SSL_CIPHERS=${SSL_CIPHERS:-'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4'}
+SSL_PROTOCOLS=${SSL_PROTOCOLS:-'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'}
 
 SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_REGISTRY_KEY_PATH}
 SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_DATA_DIR/certs/registry.key}
 SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_REGISTRY_CERT_PATH}
 SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_DATA_DIR/certs/registry.crt}
+SSL_REGISTRY_CIPHERS=${SSL_REGISTRY_CIPHERS:-$SSL_CIPHERS}
+SSL_REGISTRY_PROTOCOLS=${SSL_REGISTRY_PROTOCOLS:-$SSL_PROTOCOLS}
 
 SSL_PAGES_KEY_PATH=${SSL_PAGES_KEY_PATH:-$GITLAB_DATA_DIR/certs/pages.key}
 SSL_PAGES_CERT_PATH=${SSL_PAGES_CERT_PATH:-$GITLAB_DATA_DIR/certs/pages.crt}
+SSL_PAGES_CIPHERS=${SSL_PAGES_CIPHERS:-$SSL_CIPHERS}
+SSL_PAGES_PROTOCOLS=${SSL_PAGES_PROTOCOLS:-$SSL_PROTOCOLS}
 
 SSL_CA_CERTIFICATES_PATH=${SSL_CA_CERTIFICATES_PATH:-$CA_CERTIFICATES_PATH} # backward compatibility
 SSL_CA_CERTIFICATES_PATH=${SSL_CA_CERTIFICATES_PATH:-$GITLAB_DATA_DIR/certs/ca.crt}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 6eb19ecf5..7b58bf38f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1176,7 +1176,8 @@ nginx_configure_gitlab_ssl() {
       SSL_DHPARAM_PATH \
       SSL_VERIFY_CLIENT \
       SSL_CA_CERTIFICATES_PATH \
-      SSL_CIPHERS
+      SSL_CIPHERS \
+      SSL_PROTOCOLS
   fi
 }
 
@@ -1265,7 +1266,9 @@ nginx_configure_gitlab_registry() {
       GITLAB_REGISTRY_HOST \
       GITLAB_REGISTRY_API_URL \
       SSL_REGISTRY_KEY_PATH \
-      SSL_REGISTRY_CERT_PATH
+      SSL_REGISTRY_CERT_PATH \
+      SSL_REGISTRY_CIPHERS \
+      SSL_REGISTRY_PROTOCOLS
   fi
 }
 
@@ -1283,6 +1286,8 @@ nginx_configure_pages(){
           GITLAB_PAGES_DOMAIN \
           SSL_PAGES_CERT_PATH \
           SSL_PAGES_KEY_PATH \
+          SSL_PAGES_CIPHERS \
+          SSL_PAGES_PROTOCOLS \
           SSL_DHPARAM_PATH \
           GITLAB_LOG_DIR
       else

From 21252e898a8ae83e59025f525e4004463714ad31 Mon Sep 17 00:00:00 2001
From: sachilles <steven.achilles@googlemail.com>
Date: Tue, 16 Feb 2021 08:22:42 +0100
Subject: [PATCH 0594/1124] upgrade Gitlab CE to 13.8.4 (#2306)

---
 Changelog.md                     | 13 +++++---
 Dockerfile                       |  6 ++--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4a4c5ce65..85eedfae3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,22 +10,27 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 - added `SSL_PAGES_CIPHERS`
 - added `SSL_PAGES_PROTOCOLS`
 
+**13.8.3**
+- gitlab: upgrade CE to v13.8.4
+- gitaly: upgrade to v13.8.4
+- gitlab-shell: upgrade to v13.15.1
+
 **13.8.3**
 - gitlab: upgrade CE to v13.8.3
-- gitaly: upgrade v13.8.3
+- gitaly: upgrade to v13.8.3
 - golang: upgrade to v1.15.8
 
 **13.8.2**
 - gitlab: upgrade CE to v13.8.2
-- gitaly: upgrade v13.8.2
+- gitaly: upgrade to v13.8.2
 
 **13.8.1**
 - gitlab: upgrade CE to v13.8.1
-- gitaly: upgrade v13.8.1
+- gitaly: upgrade to v13.8.1
 
 **13.8.0**
 - gitlab: upgrade CE to v13.8.0
-- gitaly: upgrade v13.8.0
+- gitaly: upgrade to v13.8.0
 - gitlab-shell: upgrade to v13.15.0
 - gitlab-workhorse: upgrade to v8.59.0
 - gitlab-pages: upgrade to v1.34.0
diff --git a/Dockerfile b/Dockerfile
index 7b8b80c26..0f03171aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.8.3
+ARG VERSION=13.8.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.15.8 \
-    GITLAB_SHELL_VERSION=13.15.0 \
+    GITLAB_SHELL_VERSION=13.15.1 \
     GITLAB_WORKHORSE_VERSION=8.59.0 \
     GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.8.3 \
+    GITALY_SERVER_VERSION=13.8.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 42f872990..5f6a164fc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.8.3
+# sameersbn/gitlab:13.8.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.3
+docker pull sameersbn/gitlab:13.8.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.8.3
+ sameersbn/gitlab:13.8.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.8.3
+    sameersbn/gitlab:13.8.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:sanitize
+    sameersbn/gitlab:13.8.4 app:sanitize
 ```
 
 ### Piwik
@@ -1149,7 +1149,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1184,14 +1184,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake db:setup
+    sameersbn/gitlab:13.8.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.8.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.3
+docker pull sameersbn/gitlab:13.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.4
 ```
 
 ## Shell Access
@@ -1387,7 +1387,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.8.3
+    image: sameersbn/gitlab:13.8.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5d32a7569..5389ed889 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.3
+13.8.4
diff --git a/docker-compose.yml b/docker-compose.yml
index c6f349204..297c3e038 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.3
+    image: sameersbn/gitlab:13.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f681c1509..bf90ee1bc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.3
+docker pull sameersbn/gitlab:13.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.8.3
+sameersbn/gitlab:13.8.4
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 555a9c490..f0849bc12 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.3
+    image: sameersbn/gitlab:13.8.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e8cca3c1a..7313db34f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.8.3
+        image: sameersbn/gitlab:13.8.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 0271dec8bc0d2deee691350ac4a8326a916a2b83 Mon Sep 17 00:00:00 2001
From: Niclas Mietz <solidnerd@users.noreply.github.com>
Date: Tue, 16 Feb 2021 08:14:49 +0000
Subject: [PATCH 0595/1124] docs: fix changelog (#2307)

---
 Changelog.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 85eedfae3..aa8ea17ef 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,14 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.8.3-1**
+**13.8.4**
 - added `SSL_PROTOCOLS` option to change protocols of the nginx
 - added `SSL_REGISTRY_CIPHERS`
 - added `SSL_REGISTRY_PROTOCOLS`
 - added `SSL_PAGES_CIPHERS`
 - added `SSL_PAGES_PROTOCOLS`
-
-**13.8.3**
 - gitlab: upgrade CE to v13.8.4
 - gitaly: upgrade to v13.8.4
 - gitlab-shell: upgrade to v13.15.1

From 68a093cae325f62d83bfe2746bd760c5b9eb7957 Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 22 Feb 2021 16:08:25 +0100
Subject: [PATCH 0596/1124] upgrade Gitlab CE to 13.9.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aa8ea17ef..47c14e560 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.9.0**
+- gitlab: upgrade CE to v13.9.0
+- gitaly: upgrade to v13.9.0
+- gitlab-shell: upgrade to v13.16.1
+- gitlab-pages: upgrade to v1.35.0
+- gitlab-workhorse: upgrade to v8.63.0
+- golang: upgrade to v1.16
+
 **13.8.4**
 - added `SSL_PROTOCOLS` option to change protocols of the nginx
 - added `SSL_REGISTRY_CIPHERS`
diff --git a/Dockerfile b/Dockerfile
index 0f03171aa..49925debc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.8.4
+ARG VERSION=13.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.15.8 \
-    GITLAB_SHELL_VERSION=13.15.1 \
-    GITLAB_WORKHORSE_VERSION=8.59.0 \
-    GITLAB_PAGES_VERSION=1.34.0 \
-    GITALY_SERVER_VERSION=13.8.4 \
+    GOLANG_VERSION=1.16 \
+    GITLAB_SHELL_VERSION=13.16.1 \
+    GITLAB_WORKHORSE_VERSION=8.63.0 \
+    GITLAB_PAGES_VERSION=1.35.0 \
+    GITALY_SERVER_VERSION=13.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5f6a164fc..570eb0234 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.8.4
+# sameersbn/gitlab:13.9.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.4
+docker pull sameersbn/gitlab:13.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.8.4
+ sameersbn/gitlab:13.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.8.4
+    sameersbn/gitlab:13.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:sanitize
+    sameersbn/gitlab:13.9.0 app:sanitize
 ```
 
 ### Piwik
@@ -1149,7 +1149,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1184,14 +1184,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake db:setup
+    sameersbn/gitlab:13.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.4
+docker pull sameersbn/gitlab:13.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.0
 ```
 
 ## Shell Access
@@ -1387,7 +1387,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.8.4
+    image: sameersbn/gitlab:13.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5389ed889..c662e83bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.4
+13.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index af74ec6de..3538fe195 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1a085ceea..8186815ae 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 297c3e038..49a395bdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.4
+    image: sameersbn/gitlab:13.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bf90ee1bc..49472e61d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.8.4
+docker pull sameersbn/gitlab:13.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.8.4
+sameersbn/gitlab:13.9.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cf41609c3..46faeb1cd 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.2
+    image: sameersbn/gitlab:13.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f0849bc12..0db9d74e8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.8.4
+    image: sameersbn/gitlab:13.9.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7313db34f..32dabcf57 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.8.4
+        image: sameersbn/gitlab:13.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8311b1ee749768eccb3c61e40c6d43ec16fda672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20L=C3=A9on?= <bruno.leon@unyonsys.com>
Date: Tue, 23 Feb 2021 08:19:52 +0100
Subject: [PATCH 0597/1124] Set default value for BITBUCKET_URL

If this value is not set importing repo fails when connecting to
bitbucket.
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 3 ++-
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 contrib/docker-swarm/docker-compose.yml   | 1 +
 docker-compose.swarm.yml                  | 1 +
 docker-compose.yml                        | 1 +
 docs/docker-compose-keycloak.yml          | 1 +
 docs/s3_compatible_storage.md             | 1 +
 9 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5f6a164fc..08b90ad32 100644
--- a/README.md
+++ b/README.md
@@ -1047,6 +1047,7 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_GITLAB_APP_SECRET` | GitLab App Client secret. No defaults. |
 | `OAUTH_BITBUCKET_API_KEY` | BitBucket App Client ID. No defaults. |
 | `OAUTH_BITBUCKET_APP_SECRET` | BitBucket App Client secret. No defaults. |
+| `OAUTH_BITBUCKET_URL` | Bitbucket URL. Defaults: https://bitbucket.org/ |
 | `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` | The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. |
 | `OAUTH_SAML_IDP_CERT_FINGERPRINT` | The SHA1 fingerprint of the certificate. No Defaults. |
 | `OAUTH_SAML_IDP_SSO_TARGET_URL` | The URL to which the authentication request should be sent. No defaults. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 4f549a037..eaa2cdad3 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -928,7 +928,8 @@ production: &base
           args: { scope: '{{OAUTH_GITHUB_SCOPE}}' } }
       - { name: 'bitbucket',
           app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
-          app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}' }
+          app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}',
+          url: '{{OAUTH_BITBUCKET_URL}}'}
       - { name: 'gitlab',
           label: 'GitLab.com',
           app_id: '{{OAUTH_GITLAB_API_KEY}}',
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 14b0d4148..06fe83940 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -403,6 +403,7 @@ OAUTH_GITLAB_SCOPE=${OAUTH_GITLAB_SCOPE:-api}
 ### BITBUCKET
 OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY:-}
 OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET:-}
+OAUTH_BITBUCKET_URL=${OAUTH_BITBUCKET_URL:-https://bitbucket.org/}
 
 ### CROWD
 OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 7b58bf38f..72465e384 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -553,7 +553,8 @@ gitlab_configure_oauth_bitbucket() {
     OAUTH_ENABLED=${OAUTH_ENABLED:-true}
     update_template ${GITLAB_CONFIG} \
       OAUTH_BITBUCKET_API_KEY \
-      OAUTH_BITBUCKET_APP_SECRET
+      OAUTH_BITBUCKET_APP_SECRET \
+      OAUTH_BITBUCKET_URL
   else
     exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG}
   fi
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index af74ec6de..bf8c793a7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -127,6 +127,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1a085ceea..ebc75b275 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -189,6 +189,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
diff --git a/docker-compose.yml b/docker-compose.yml
index 297c3e038..a6c3f6a4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,6 +129,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cf41609c3..344140366 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -123,6 +123,7 @@ services:
 
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
 
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 7471206bc..1a4914109 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -174,6 +174,7 @@ services:
     - OAUTH_GITLAB_APP_SECRET=
     - OAUTH_BITBUCKET_API_KEY=
     - OAUTH_BITBUCKET_APP_SECRET=
+    - OAUTH_BITBUCKET_URL=
     - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
     - OAUTH_SAML_IDP_CERT_FINGERPRINT=
     - OAUTH_SAML_IDP_SSO_TARGET_URL=

From 936d942936d399ed869a7d89eb6586623bf285f1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 25 Feb 2021 20:51:45 +0100
Subject: [PATCH 0598/1124] upgrade Gitlab CE to 13.9.1

---
 Changelog.md                     |  5 +++
 Dockerfile                       |  4 +--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 47c14e560..be1bfbc6e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.9.1**
+- gitlab: upgrade CE to v13.9.1
+- gitaly: upgrade to v13.9.1
+
+
 **13.9.0**
 - gitlab: upgrade CE to v13.9.0
 - gitaly: upgrade to v13.9.0
diff --git a/Dockerfile b/Dockerfile
index 49925debc..c3268bed3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.9.0
+ARG VERSION=13.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.16.1 \
     GITLAB_WORKHORSE_VERSION=8.63.0 \
     GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.0 \
+    GITALY_SERVER_VERSION=13.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 570eb0234..7fac10c3d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.0
+# sameersbn/gitlab:13.9.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.0
+docker pull sameersbn/gitlab:13.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.0
+ sameersbn/gitlab:13.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.0
+    sameersbn/gitlab:13.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:sanitize
+    sameersbn/gitlab:13.9.1 app:sanitize
 ```
 
 ### Piwik
@@ -1149,7 +1149,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1184,14 +1184,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake db:setup
+    sameersbn/gitlab:13.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.0 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.1 # Choose to restore from 1515629493
 ```
 
 
@@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.0
+docker pull sameersbn/gitlab:13.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.1
 ```
 
 ## Shell Access
@@ -1387,7 +1387,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c662e83bd..8ba26053a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.0
+13.9.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 49a395bdd..ced3a3ae1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 49472e61d..c4348c8f4 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.0
+docker pull sameersbn/gitlab:13.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.0
+sameersbn/gitlab:13.9.1
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0db9d74e8..4d0dec317 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.9.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 32dabcf57..eb8f066e6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.0
+        image: sameersbn/gitlab:13.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 7197de2f3e7506e97348215b13fd74c3432cbdaf Mon Sep 17 00:00:00 2001
From: 3kami3 <github@yumimix.org>
Date: Thu, 4 Mar 2021 00:15:58 +0900
Subject: [PATCH 0599/1124] Update Puma Worker Killer RAM limits

---
 README.md                   | 4 ++--
 assets/runtime/env-defaults | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5f6a164fc..78bf6c90a 100644
--- a/README.md
+++ b/README.md
@@ -956,8 +956,8 @@ Below is the complete list of available options that can be used to customize yo
 | `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
 | `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
 | `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
-| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `850`. |
-| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `550`. |
+| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. |
+| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. |
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 14b0d4148..bbca231ea 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -68,8 +68,8 @@ PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1}
 PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16}
 PUMA_WORKERS=${PUMA_WORKERS:-3}
 PUMA_TIMEOUT=${PUMA_TIMEOUT:-60}
-PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-850}
-PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-550}
+PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-1024}
+PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-800}
 
 # Set Default values according to the documentation
 # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer

From d79ed948a9cbf1e0c1abf6cd730d2f20ffd85d5a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 4 Mar 2021 23:14:26 +0100
Subject: [PATCH 0600/1124] upgrade Gitlab CE to 13.9.2

---
 Changelog.md                     |  6 ++++
 Dockerfile                       |  6 ++--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index be1bfbc6e..07a049bb5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.9.1**
+- gitlab: upgrade CE to v13.9.2
+- gitaly: upgrade to v13.9.2
+- gitlab-workhorse: upgrade to v8.63.2
+
+
 **13.9.1**
 - gitlab: upgrade CE to v13.9.1
 - gitaly: upgrade to v13.9.1
diff --git a/Dockerfile b/Dockerfile
index c3268bed3..c3bf983f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.9.1
+ARG VERSION=13.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16 \
     GITLAB_SHELL_VERSION=13.16.1 \
-    GITLAB_WORKHORSE_VERSION=8.63.0 \
+    GITLAB_WORKHORSE_VERSION=8.63.2 \
     GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.1 \
+    GITALY_SERVER_VERSION=13.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 7fac10c3d..76e37be7e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.1
+# sameersbn/gitlab:13.9.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.1
+docker pull sameersbn/gitlab:13.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.1
+ sameersbn/gitlab:13.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.1
+    sameersbn/gitlab:13.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:sanitize
+    sameersbn/gitlab:13.9.2 app:sanitize
 ```
 
 ### Piwik
@@ -1149,7 +1149,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1184,14 +1184,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake db:setup
+    sameersbn/gitlab:13.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.1 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.2 # Choose to restore from 1515629493
 ```
 
 
@@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.1
+docker pull sameersbn/gitlab:13.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.2
 ```
 
 ## Shell Access
@@ -1387,7 +1387,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.1
+    image: sameersbn/gitlab:13.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 8ba26053a..561a05bc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.1
+13.9.2
diff --git a/docker-compose.yml b/docker-compose.yml
index ced3a3ae1..be7d853af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.1
+    image: sameersbn/gitlab:13.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c4348c8f4..5d8ec509b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.1
+docker pull sameersbn/gitlab:13.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.1
+sameersbn/gitlab:13.9.2
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4d0dec317..ae288a1a5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.1
+    image: sameersbn/gitlab:13.9.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index eb8f066e6..1bd26d03a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.1
+        image: sameersbn/gitlab:13.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 22d33c9b3bab9bc2c4a11c09351ccc6d2ff3a9d3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 9 Mar 2021 19:38:32 +0100
Subject: [PATCH 0601/1124] upgrade Gitlab CE to 13.9.3

---
 Changelog.md                     |  7 +++-
 Dockerfile                       |  6 ++--
 README.md                        | 56 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 8 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 07a049bb5..f24756bb6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.9.1**
+**13.9.3**
+- gitlab: upgrade CE to v13.9.3
+- gitaly: upgrade to v13.9.3
+- gitlab-shell: upgrade to v13.17.0
+
+**13.9.2**
 - gitlab: upgrade CE to v13.9.2
 - gitaly: upgrade to v13.9.2
 - gitlab-workhorse: upgrade to v8.63.2
diff --git a/Dockerfile b/Dockerfile
index c3bf983f5..375931d4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:bionic-20210118
 
-ARG VERSION=13.9.2
+ARG VERSION=13.9.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16 \
-    GITLAB_SHELL_VERSION=13.16.1 \
+    GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_WORKHORSE_VERSION=8.63.2 \
     GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.2 \
+    GITALY_SERVER_VERSION=13.9.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 76e37be7e..e064e595f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.2
+# sameersbn/gitlab:13.9.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.2
+docker pull sameersbn/gitlab:13.9.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.2
+ sameersbn/gitlab:13.9.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.2
+    sameersbn/gitlab:13.9.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:sanitize
+    sameersbn/gitlab:13.9.3 app:sanitize
 ```
 
 ### Piwik
@@ -1149,7 +1149,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1184,14 +1184,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake db:setup
+    sameersbn/gitlab:13.9.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.2 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.3 # Choose to restore from 1515629493
 ```
 
 
@@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.2
+docker pull sameersbn/gitlab:13.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.3
 ```
 
 ## Shell Access
@@ -1387,7 +1387,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.2
+    image: sameersbn/gitlab:13.9.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 561a05bc7..077947381 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.2
+13.9.3
diff --git a/docker-compose.yml b/docker-compose.yml
index be7d853af..20a61178e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.2
+    image: sameersbn/gitlab:13.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5d8ec509b..48b0f9f87 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.2
+docker pull sameersbn/gitlab:13.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.2
+sameersbn/gitlab:13.9.3
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ae288a1a5..7574abc26 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.2
+    image: sameersbn/gitlab:13.9.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1bd26d03a..59a0790a2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.2
+        image: sameersbn/gitlab:13.9.3
         env:
         - name: TZ
           value: Asia/Kolkata

From c76d3734f2295803a7a4c81c6cfcf9af6a96b5b3 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 10 Mar 2021 10:32:10 +0530
Subject: [PATCH 0602/1124] removed extra newlines

---
 docs/keycloak-idp.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 37d11ab4e..149e639cb 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -28,7 +28,6 @@ Next, click save, get the client secret generated by Keycloak and start filling
 
 Set the following in the docker-compose file:
 
-
 ```yaml
     - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
     - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
@@ -50,7 +49,6 @@ The following must also be configured:
 
 The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. 
 
-
 Also, make sure the following variables are filled in the docker-compose file:
 
 ```yaml

From adf79a6c112d0b50e71256a90b8a297b82833968 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Wed, 10 Mar 2021 13:42:54 +0530
Subject: [PATCH 0603/1124] functions: properly delete the bitbucket auth
 config when not in use

---
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/functions                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index eaa2cdad3..c39311e8a 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -929,7 +929,7 @@ production: &base
       - { name: 'bitbucket',
           app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
           app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}',
-          url: '{{OAUTH_BITBUCKET_URL}}'}
+          url: '{{OAUTH_BITBUCKET_URL}}' }
       - { name: 'gitlab',
           label: 'GitLab.com',
           app_id: '{{OAUTH_GITLAB_API_KEY}}',
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 72465e384..7d65ae1f4 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -556,7 +556,7 @@ gitlab_configure_oauth_bitbucket() {
       OAUTH_BITBUCKET_APP_SECRET \
       OAUTH_BITBUCKET_URL
   else
-    exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_URL}}/d" ${GITLAB_CONFIG}
   fi
 }
 

From 7fe3673540878607d3cb51903033eb7cba98cf0b Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@fuloi.com>
Date: Thu, 11 Mar 2021 11:01:22 +0530
Subject: [PATCH 0604/1124] fix versions used in yaml samples

---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docs/docker-compose-keycloak.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 582be8e62..056cad229 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9d82586eb..0a21815f6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.9.3
     depends_on:
     - redis
     - postgresql

From 9b7536a32ebefa58ab4eb81457c823213cc1a521 Mon Sep 17 00:00:00 2001
From: l00v3 <love@localhost.localdomain>
Date: Fri, 12 Mar 2021 11:59:03 +0100
Subject: [PATCH 0605/1124] Add LDAP_PREVENT_LDAP_SIGN_IN configuration
 parameter

Committer: l00v3 <love@localhost.localdomain>
---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 52381bfc3..a28a37418 100644
--- a/README.md
+++ b/README.md
@@ -1015,6 +1015,7 @@ Below is the complete list of available options that can be used to customize yo
 | `LDAP_USER_ATTRIBUTE_FIRSTNAME` | Attribute field for the forename of a user. Default to `givenName` |
 | `LDAP_USER_ATTRIBUTE_LASTNAME` |  Attribute field for the surname of a user. Default to `sn` |
 | `LDAP_LOWERCASE_USERNAMES` | GitLab will lower case the username for the LDAP Server. Defaults to `false` |
+| `LDAP_PREVENT_LDAP_SIGN_IN` | Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), defaults to `false` |
 | `OAUTH_ENABLED` | Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`. |
 | `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` | Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
 | `OAUTH_ALLOW_SSO` | Comma separated list of oauth providers for single sign-on. This allows users to login without having a user account. The account is created automatically when authentication is successful. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index c39311e8a..f80dc63d2 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -593,7 +593,7 @@ production: &base
   #   bundle exec rake gitlab:ldap:check RAILS_ENV=production
   ldap:
     enabled: {{LDAP_ENABLED}}
-    prevent_ldap_sign_in: false
+    prevent_ldap_sign_in: {{LDAP_PREVENT_LDAP_SIGN_IN}}
 
     # This setting controls the number of seconds between LDAP permission checks
     # for each user. After this time has expired for a given user, their next
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 1f2249739..409b1ca7d 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -344,6 +344,7 @@ LDAP_USER_ATTRIBUTE_LASTNAME=${LDAP_USER_ATTRIBUTE_LASTNAME:-sn}
 LDAP_LOWERCASE_USERNAMES="${LDAP_LOWERCASE_USERNAMES:-false}"
 LDAP_LABEL=${LDAP_LABEL:-LDAP}
 LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-}
+LDAP_PREVENT_LDAP_SIGN_IN=${LDAP_PREVENT_LDAP_SIGN_IN:-false}
 case ${LDAP_UID} in
   userPrincipalName) LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-false} ;;
   *) LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-true}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 7d65ae1f4..82698acab 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -439,7 +439,8 @@ gitlab_configure_ldap() {
     LDAP_USER_ATTRIBUTE_NAME \
     LDAP_USER_ATTRIBUTE_FIRSTNAME \
     LDAP_USER_ATTRIBUTE_LASTNAME \
-    LDAP_LABEL
+    LDAP_LABEL \
+    LDAP_PREVENT_LDAP_SIGN_IN
 }
 
 gitlab_configure_oauth_cas3() {

From 5d27e362c136fcd917a84ccef0b88d1fb2f0e28d Mon Sep 17 00:00:00 2001
From: "a.shibata" <philosophum@gmail.com>
Date: Fri, 12 Mar 2021 23:42:10 +0900
Subject: [PATCH 0606/1124] docs: upgrade redis to redis:5.0.9

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 52381bfc3..9c25e3119 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:4.0.9-2
+    redis:5.0.9
 ```
 
 Step 3. Launch the gitlab container
@@ -359,7 +359,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis](
 First, lets pull the redis image from the docker index.
 
 ```bash
-docker pull sameersbn/redis:4.0.9-2
+docker pull redis:5.0.9
 ```
 
 Lets start the redis container
@@ -367,7 +367,7 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    sameersbn/redis:4.0.9-2
+    redis:5.0.9
 ```
 
 We are now ready to start the GitLab application.

From 0eafcfb3956de7320f4c53a8303b57c57e5d4efd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 17 Mar 2021 19:23:33 +0100
Subject: [PATCH 0607/1124] upgrade Gitlab CE to 13.9.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f24756bb6..a378fe513 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.9.3**
+- gitlab: upgrade CE to v13.9.4
+- gitaly: upgrade to v13.9.4
+- golang: upgrade to v1.16.2
+- ubuntu: upgrade to bionic-20210222
+
 **13.9.3**
 - gitlab: upgrade CE to v13.9.3
 - gitaly: upgrade to v13.9.3
diff --git a/Dockerfile b/Dockerfile
index 375931d4f..9f53c7c80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:bionic-20210118
+FROM ubuntu:bionic-20210222
 
-ARG VERSION=13.9.3
+ARG VERSION=13.9.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16 \
+    GOLANG_VERSION=1.16.2 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_WORKHORSE_VERSION=8.63.2 \
     GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.3 \
+    GITALY_SERVER_VERSION=13.9.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 52381bfc3..bb78f2456 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.3
+# sameersbn/gitlab:13.9.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.3
+docker pull sameersbn/gitlab:13.9.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.3
+ sameersbn/gitlab:13.9.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.3
+    sameersbn/gitlab:13.9.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:sanitize
+    sameersbn/gitlab:13.9.4 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake db:setup
+    sameersbn/gitlab:13.9.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.3 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493
 ```
 
 
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.3
+docker pull sameersbn/gitlab:13.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.3
+    image: sameersbn/gitlab:13.9.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 077947381..e66137553 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.3
+13.9.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 056cad229..7d89c7577 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.3
+    image: sameersbn/gitlab:13.9.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d9645786..cfe43c564 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.3
+    image: sameersbn/gitlab:13.9.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 48b0f9f87..ee24f91ad 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.3
+docker pull sameersbn/gitlab:13.9.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.3
+sameersbn/gitlab:13.9.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 0a21815f6..30c5bddda 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.3
+    image: sameersbn/gitlab:13.9.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7574abc26..8b7d9f859 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.3
+    image: sameersbn/gitlab:13.9.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 59a0790a2..9778e11e2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.3
+        image: sameersbn/gitlab:13.9.4
         env:
         - name: TZ
           value: Asia/Kolkata

From a301e50dea2d7ffccf35a38ec3684154479a5ebe Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 19 Mar 2021 05:43:52 +0100
Subject: [PATCH 0608/1124] Fix typo

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a378fe513..076884dd5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,7 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.9.3**
+**13.9.4**
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
 - golang: upgrade to v1.16.2

From d289ed1cd116fc46461a5bccb26880ab9fe852da Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 22 Mar 2021 21:30:12 +0100
Subject: [PATCH 0609/1124] upgrade to gitlab CE 13.10.0

---
 Dockerfile                              |  7 ++--
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 9 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9f53c7c80..b8a5794d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,13 @@
 FROM ubuntu:bionic-20210222
 
-ARG VERSION=13.9.4
+ARG VERSION=13.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.2 \
     GITLAB_SHELL_VERSION=13.17.0 \
-    GITLAB_WORKHORSE_VERSION=8.63.2 \
-    GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.4 \
+    GITLAB_PAGES_VERSION=1.36.0 \
+    GITALY_SERVER_VERSION=13.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bb78f2456..c400fdfc3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.4
+# sameersbn/gitlab:13.10.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.4
+ sameersbn/gitlab:13.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:sanitize
+    sameersbn/gitlab:13.10.0 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake db:setup
+    sameersbn/gitlab:13.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493
 ```
 
 
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.0
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e66137553..c554e7e86 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.4
+13.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7d89c7577..0a89e6825 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cfe43c564..87ac1f956 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ee24f91ad..d326fa548 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.4
+sameersbn/gitlab:13.10.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 30c5bddda..6ff123b2c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8b7d9f859..4caaac6e8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.10.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9778e11e2..10007f4bc 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.4
+        image: sameersbn/gitlab:13.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From af6bfcb7897e002598195e2eaf564499fb225aed Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Mon, 22 Mar 2021 21:55:05 +0100
Subject: [PATCH 0610/1124] workhorse is now bundled with gitlab

---
 assets/build/install.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 0278c92ac..63f0c155e 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -3,11 +3,10 @@ set -e
 
 GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-foss.git
 GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2
-GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git
 GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git
 GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git
 
-GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse
+GITLAB_WORKHORSE_BUILD_DIR=${GITLAB_INSTALL_DIR}/workhorse
 GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages
 GITLAB_GITALY_BUILD_DIR=/tmp/gitaly
 
@@ -74,7 +73,6 @@ exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BU
 fi
 
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
-GITLAB_WORKHORSE_VERSION=${GITLAB_WORKHOUSE_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_WORKHORSE_VERSION)}
 GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}
 
 # download golang
@@ -100,11 +98,9 @@ exec_as_git "PATH=$PATH" make verify setup
 # remove unused repositories directory created by gitlab-shell install
 rm -rf ${GITLAB_HOME}/repositories
 
-# download gitlab-workhorse
-echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..."
-git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_BUILD_DIR}
+# build gitlab-workhorse
+echo "Build gitlab-workhorse"
 make -C ${GITLAB_WORKHORSE_BUILD_DIR} install
-
 # clean up
 rm -rf ${GITLAB_WORKHORSE_BUILD_DIR}
 
@@ -445,3 +441,4 @@ rm -rf /var/lib/apt/lists/*
 # clean up caches
 rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go
 rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules
+rm -r /tmp/* 

From 68f78f8c89824f1829bc9793606356dc277d16b1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 31 Mar 2021 21:16:42 +0200
Subject: [PATCH 0611/1124] upgrade GitLab CE to 13.10.1

---
 Changelog.md                            |  9 +++++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 076884dd5..31adec2a2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.10.1**
+- gitlab: upgrade CE to v13.10.1
+- gitaly: upgrade to v13.10.1
+
+**13.10.0**
+- gitlab: upgrade CE to v13.10.0
+- gitaly: upgrade to v13.10.0
+- gitlab-pages: upgrade to v1.36.0
+
 **13.9.4**
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
diff --git a/Dockerfile b/Dockerfile
index b8a5794d4..d7cad1354 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:bionic-20210222
 
-ARG VERSION=13.10.0
+ARG VERSION=13.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.2 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.36.0 \
-    GITALY_SERVER_VERSION=13.10.0 \
+    GITALY_SERVER_VERSION=13.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c400fdfc3..41a383777 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.10.0
+# sameersbn/gitlab:13.10.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.0
+docker pull sameersbn/gitlab:13.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.10.0
+ sameersbn/gitlab:13.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.10.0
+    sameersbn/gitlab:13.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:sanitize
+    sameersbn/gitlab:13.10.1 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake db:setup
+    sameersbn/gitlab:13.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.0
+docker pull sameersbn/gitlab:13.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.1
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.10.0
+    image: sameersbn/gitlab:13.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c554e7e86..81c05ffb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.0
+13.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0a89e6825..cbba868bb 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.0
+    image: sameersbn/gitlab:13.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e4f7dbdc3..7fd289c80 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.9.0
+    image: sameersbn/gitlab:13.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 87ac1f956..c3db865aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.0
+    image: sameersbn/gitlab:13.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d326fa548..15279b6f6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.0
+docker pull sameersbn/gitlab:13.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.10.0
+sameersbn/gitlab:13.10.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6ff123b2c..e2389883e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.0
+    image: sameersbn/gitlab:13.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4caaac6e8..a443b5ef6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.0
+    image: sameersbn/gitlab:13.10.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 10007f4bc..ba6def6d5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.10.0
+        image: sameersbn/gitlab:13.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 1cc7036cadd5e00a2b5ec0a2faeaef3e669ce92a Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Thu, 1 Apr 2021 10:08:27 +0200
Subject: [PATCH 0612/1124] v13.9.5

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 076884dd5..aac48149d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.9.5**
+- gitlab: upgrade CE to v13.9.5
+- gitaly: upgrade to v13.9.5
+
 **13.9.4**
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
diff --git a/Dockerfile b/Dockerfile
index 9f53c7c80..20764f240 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:bionic-20210222
 
-ARG VERSION=13.9.4
+ARG VERSION=13.9.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_WORKHORSE_VERSION=8.63.2 \
     GITLAB_PAGES_VERSION=1.35.0 \
-    GITALY_SERVER_VERSION=13.9.4 \
+    GITALY_SERVER_VERSION=13.9.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bb78f2456..02687bd2b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.9.4
+# sameersbn/gitlab:13.9.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.9.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.9.4
+ sameersbn/gitlab:13.9.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.9.4
+    sameersbn/gitlab:13.9.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:sanitize
+    sameersbn/gitlab:13.9.5 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake db:setup
+    sameersbn/gitlab:13.9.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
 
 ```bash
 docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
-docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493
+docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.5 # Choose to restore from 1515629493
 ```
 
 
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.9.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.9.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.9.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.9.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.5
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.9.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e66137553..46ebf3b7a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.4
+13.9.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7d89c7577..f8c479cb2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cfe43c564..0364f41f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ee24f91ad..b6d2eb02e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.9.4
+docker pull sameersbn/gitlab:13.9.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.9.4
+sameersbn/gitlab:13.9.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 30c5bddda..c7b54b456 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.9.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8b7d9f859..334e972d4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.9.4
+    image: sameersbn/gitlab:13.9.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9778e11e2..6be0fb3fb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.9.4
+        image: sameersbn/gitlab:13.9.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 80ebf3b5e95a3be9a7de51385df636337471ea97 Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Thu, 1 Apr 2021 22:12:54 +0200
Subject: [PATCH 0613/1124] Add missing library (needed for the new mimemagic
 dependency)

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

diff --git a/Dockerfile b/Dockerfile
index 20764f240..67ab7dd27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,7 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm5 libreadline7 libncurses5 libffi6 \
       libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \
+      libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \

From 9fb04969fcf94bfa258444847959e552c0f62150 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 2 Apr 2021 23:58:35 +0200
Subject: [PATCH 0614/1124] Add missing library (needed for the new mimemagic
 dependency)

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

diff --git a/Dockerfile b/Dockerfile
index d7cad1354..677de43e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,7 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
       libgdbm5 libreadline7 libncurses5 libffi6 \
       libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \
+      libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \

From e786b094ddafb132c16316e901762b9ceed0b4ce Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 3 Apr 2021 00:07:17 +0200
Subject: [PATCH 0615/1124] Complete changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 31adec2a2..e4a90cc13 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 **13.10.1**
 - gitlab: upgrade CE to v13.10.1
 - gitaly: upgrade to v13.10.1
+- added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma)
 
 **13.10.0**
 - gitlab: upgrade CE to v13.10.0

From ea35c5d0b4a4db05cb6dd7db30e461dae5293944 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 2 Apr 2021 19:16:01 +0200
Subject: [PATCH 0616/1124] upgrade GitLab CE to 13.10.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4a90cc13..ea7e988e6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.10.2**
+- gitlab: upgrade CE to v13.10.2
+- gitaly: upgrade to v13.10.2
+- golang: upgrade to v1.16.3
+- ubuntu: upgrade to bionic-20210325
+
 **13.10.1**
 - gitlab: upgrade CE to v13.10.1
 - gitaly: upgrade to v13.10.1
diff --git a/Dockerfile b/Dockerfile
index 677de43e4..a464dd480 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:bionic-20210222
+FROM ubuntu:bionic-20210325
 
-ARG VERSION=13.10.1
+ARG VERSION=13.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.2 \
+    GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.36.0 \
-    GITALY_SERVER_VERSION=13.10.1 \
+    GITALY_SERVER_VERSION=13.10.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 41a383777..b6bf90ed0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.10.1
+# sameersbn/gitlab:13.10.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.1
+docker pull sameersbn/gitlab:13.10.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.10.1
+ sameersbn/gitlab:13.10.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.10.1
+    sameersbn/gitlab:13.10.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:sanitize
+    sameersbn/gitlab:13.10.2 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake db:setup
+    sameersbn/gitlab:13.10.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.10.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.1
+docker pull sameersbn/gitlab:13.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.2
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cbba868bb..ebcf2e5e7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7fd289c80..fa7f857da 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c3db865aa..d8021004d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 15279b6f6..bc1d45932 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.1
+docker pull sameersbn/gitlab:13.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.10.1
+sameersbn/gitlab:13.10.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e2389883e..23b119613 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a443b5ef6..7f1b623ef 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.1
+    image: sameersbn/gitlab:13.10.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ba6def6d5..fbeb2b84f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.10.1
+        image: sameersbn/gitlab:13.10.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 82630d2d93e424467c1ab9d5f43918f1a8ba023a Mon Sep 17 00:00:00 2001
From: intec_bf <bjoern@fernhomberg.de>
Date: Sat, 3 Apr 2021 00:22:21 +0200
Subject: [PATCH 0617/1124] use Ubuntu 20.04 as base image

---
 Dockerfile              | 21 +++++++++++----------
 assets/build/install.sh |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a464dd480..8a9ebe37a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20210325
+FROM ubuntu:focal-20210325
 
 ARG VERSION=13.10.2
 
@@ -25,19 +25,20 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     wget ca-certificates apt-transport-https gnupg2 \
+ && apt-get upgrade -y \
  && rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
- && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" >> /etc/apt/sources.list \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
+ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \
- && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu bionic main" >> /etc/apt/sources.list \
+ && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu focal main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \
- && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu bionic main" >> /etc/apt/sources.list \
+ && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
- && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_12.x bionic main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb https://deb.nodesource.com/node_12.x focal main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && set -ex \
@@ -46,9 +47,9 @@ RUN set -ex && \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \
       git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
-      libpq5 zlib1g libyaml-0-2 libssl1.0.0 \
-      libgdbm5 libreadline7 libncurses5 libffi6 \
-      libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \
+      libpq5 zlib1g libyaml-0-2 libssl1.1 \
+      libgdbm6 libreadline8 libncurses5 libffi7 \
+      libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
       libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 63f0c155e..868e5744b 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -43,7 +43,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL
 # only for simplicity.
 paxctl -cvm "$(command -v ruby${RUBY_VERSION})"
 # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
-paxctl -cvm "$(command -v nodejs)"
+paxctl -cvm "$(command -v node)"
 
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub

From 4ccb8eefb550f44520e4ca9123e926c8c8fa7a1c Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 13 Mar 2021 20:43:30 +0900
Subject: [PATCH 0618/1124] Support healthcheck with relative URL

traditional one with relative url always returns 404 (unhealthy).
Now we can use ${GITLAB_RELATIVE_URL_ROOT} variable to set healcheck URL
after moving script generation to runtime,
---
 assets/build/install.sh  | 11 -----------
 assets/runtime/functions | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 868e5744b..32cfd21fe 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -423,17 +423,6 @@ programs=sshd,nginx,mail_room,cron
 priority=20
 EOF
 
-# configure healthcheck script
-## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html
-cat > /usr/local/sbin/healthcheck <<EOF
-#!/bin/bash
-url=http://localhost/-/liveness
-options=( '--insecure' '--location' '--silent' )
-curl "\${options[@]}" \$url
-[[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
-EOF
-chmod +x /usr/local/sbin/healthcheck
-
 # purge build dependencies and cleanup apt
 DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES}
 rm -rf /var/lib/apt/lists/*
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 7d65ae1f4..c341c3099 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1523,6 +1523,19 @@ update_ssh_listen_port() {
   sed -i "s|#Port 22|Port ${GITLAB_SSH_LISTEN_PORT}|g" /etc/ssh/sshd_config
 }
 
+generate_healthcheck_script() {
+  # configure healthcheck script
+  ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html
+cat > /usr/local/sbin/healthcheck <<EOF
+#!/bin/bash
+url=http://localhost${GITLAB_RELATIVE_URL_ROOT}/-/liveness
+options=( '--insecure' '--location' '--silent' )
+curl "\${options[@]}" \$url
+[[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
+EOF
+  chmod +x /usr/local/sbin/healthcheck
+}
+
 initialize_system() {
   map_uidgid
   initialize_logdir
@@ -1665,6 +1678,7 @@ configure_gitlab() {
   gitlab_configure_registry
   gitlab_configure_pages
   gitlab_configure_sentry
+  generate_healthcheck_script
 
   # remove stale gitlab.socket
   rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket

From 87c4bb9e962d7197c5967b9e0319dc29d4b020e5 Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Wed, 14 Apr 2021 21:30:58 +0200
Subject: [PATCH 0619/1124] upgrade GitLab CE to 13.10.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5fb01457..08470310a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.10.3**
+- gitlab: upgrade CE to v13.10.3
+- gitaly: upgrade to v13.10.3
+
 **13.10.2**
 - gitlab: upgrade CE to v13.10.2
 - gitaly: upgrade to v13.10.2
diff --git a/Dockerfile b/Dockerfile
index 8a9ebe37a..db8a46118 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210325
 
-ARG VERSION=13.10.2
+ARG VERSION=13.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.36.0 \
-    GITALY_SERVER_VERSION=13.10.2 \
+    GITALY_SERVER_VERSION=13.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b6bf90ed0..7482b215e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.10.2
+# sameersbn/gitlab:13.10.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.2
+docker pull sameersbn/gitlab:13.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.10.2
+ sameersbn/gitlab:13.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.10.2
+    sameersbn/gitlab:13.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:sanitize
+    sameersbn/gitlab:13.10.3 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake db:setup
+    sameersbn/gitlab:13.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.2
+docker pull sameersbn/gitlab:13.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.3
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ebcf2e5e7..f3432f9a6 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index fa7f857da..19eb56744 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d8021004d..3b0c78c17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bc1d45932..f83e5c0b0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.2
+docker pull sameersbn/gitlab:13.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.10.2
+sameersbn/gitlab:13.10.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 23b119613..b9020c6fd 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7f1b623ef..36ba55ff8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.2
+    image: sameersbn/gitlab:13.10.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fbeb2b84f..8d00889a0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.10.2
+        image: sameersbn/gitlab:13.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 53219535d3c282b11f1c21b256f0a602265534ea Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Thu, 15 Apr 2021 22:01:58 +0200
Subject: [PATCH 0620/1124] Update VERSION to 13.10.3

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 81c05ffb8..f82ccdb09 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.1
+13.10.3

From b820c61f33d83a7644657585b6f586cbc640b89b Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Thu, 25 Feb 2021 15:48:11 +0900
Subject: [PATCH 0621/1124] Add content_security_policy params

---
 README.md                                 | 18 ++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml | 36 +++++++++++------------
 assets/runtime/env-defaults               | 21 +++++++++++++
 assets/runtime/functions                  | 24 +++++++++++++++
 4 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index b6bf90ed0..fbe64ca53 100644
--- a/README.md
+++ b/README.md
@@ -924,6 +924,24 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` | Set to `true` to enable the sidekiq exporter, enabled by default. |
 | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` | Sidekiq exporter address, defaults to `0.0.0.0` |
 | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` | Sidekiq exporter port, defaults to `3807` |
+| `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` | Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. |
+| `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` | Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` | The value of the `base-uri` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` | The value of the `child-src` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` | The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` | The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` | The value of the `font-src` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` | The value of the `form-action` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` | The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` | The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` | The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` | The value of the `manifest-src` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` | The value of the `media-src` directive in the `Content-Security-Policy` header |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` | The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'`  |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` | The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` | The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` | The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` |
+| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` | The value of the `report-uri` directive in the `Content-Security-Policy` header |
 | `SSL_SELF_SIGNED` | Set to `true` when using self signed ssl certificates. `false` by default. |
 | `SSL_CERTIFICATE_PATH` | Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` |
 | `SSL_KEY_PATH` | Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index c39311e8a..42befb7b0 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -53,25 +53,25 @@ production: &base
     # Content Security Policy
     # See https://guides.rubyonrails.org/security.html#content-security-policy
     content_security_policy:
-      enabled: true
-      report_only: false
+      enabled: {{GITLAB_CONTENT_SECURITY_POLICY_ENABLED}}
+      report_only: {{GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY}}
       directives:
-        base_uri:
-        child_src:
-        connect_src: "'self' http://localhost:* ws://localhost:* wss://localhost:*"
-        default_src: "'self'"
-        font_src:
-        form_action:
-        frame_ancestors: "'self'"
-        frame_src: "'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"
-        img_src: "* data: blob:"
-        manifest_src:
-        media_src:
-        object_src: "'none'"
-        script_src: "'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"
-        style_src: "'self' 'unsafe-inline'"
-        worker_src: "'self' blob:"
-        report_uri:
+        base_uri: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI}}"
+        child_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC}}"
+        connect_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC}}"
+        default_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC}}"
+        font_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC}}"
+        form_action: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION}}"
+        frame_ancestors: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS}}"
+        frame_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC}}"
+        img_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC}}"
+        manifest_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC}}"
+        media_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC}}"
+        object_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC}}"
+        script_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC}}"
+        style_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC}}"
+        worker_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC}}"
+        report_uri: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI}}"
 
     # Trusted Proxies
     # Customize if you have GitLab behind a reverse proxy which is running on a different machine.
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 1f2249739..40ff90b25 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -516,3 +516,24 @@ SENTRY_ENABLED=${SENTRY_ENABLED:-false}
 SENTRY_DSN=${SENTRY_DSN:-}
 SENTRY_CLIENTSIDE_DSN=${SENTRY_CLIENTSIDE_DSN:-}
 SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-production}
+
+## Content Security Policy
+# See https://guides.rubyonrails.org/security.html#content-security-policy
+GITLAB_CONTENT_SECURITY_POLICY_ENABLED=${GITLAB_CONTENT_SECURITY_POLICY_ENABLED:-true}
+GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY=${GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY:-false}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC:-"'self' http://localhost:* ws://localhost:* wss://localhost:*"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC:-"'self'"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS:-"'self'"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC:-"'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC:-"* data: blob:"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC:-}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC:-"'none'"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC:-"'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC:-"'self' 'unsafe-inline'"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC:-"'self' blob:"}
+GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index c341c3099..8c1253c8e 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1164,6 +1164,29 @@ gitlab_configure_sentry(){
     SENTRY_ENVIRONMENT
 }
 
+gitlab_configure_content_security_policy(){
+  echo "Configuring gitlab::content_security_policy..."
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_CONTENT_SECURITY_POLICY_ENABLED \
+    GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC \
+    GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI
+}
+
 nginx_configure_gitlab_ssl() {
   if [[ ${GITLAB_HTTPS} == true && -f ${SSL_CERTIFICATE_PATH} && -f ${SSL_KEY_PATH} && -f ${SSL_DHPARAM_PATH} ]]; then
     echo "Configuring nginx::gitlab::ssl..."
@@ -1679,6 +1702,7 @@ configure_gitlab() {
   gitlab_configure_pages
   gitlab_configure_sentry
   generate_healthcheck_script
+  gitlab_configure_content_security_policy
 
   # remove stale gitlab.socket
   rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket

From 74425065d3e50761863e5d81c044606df24b8262 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 22 Apr 2021 17:00:38 +0200
Subject: [PATCH 0622/1124] upgrade GitLab CE to 13.11.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 08470310a..a703f795f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.11.0**
+- gitlab: upgrade CE to v13.11.0
+- gitaly: upgrade to v13.11.0
+- gitlab-pages: upgrade to v1.38.0
+- ubuntu: upgrade to focal-20210401
+
 **13.10.3**
 - gitlab: upgrade CE to v13.10.3
 - gitaly: upgrade to v13.10.3
diff --git a/Dockerfile b/Dockerfile
index db8a46118..71e0b1a98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:focal-20210325
+FROM ubuntu:focal-20210401
 
-ARG VERSION=13.10.3
+ARG VERSION=13.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.36.0 \
-    GITALY_SERVER_VERSION=13.10.3 \
+    GITALY_SERVER_VERSION=13.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 7482b215e..c4a4455ae 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.10.3
+# sameersbn/gitlab:13.11.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.3
+docker pull sameersbn/gitlab:13.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.10.3
+ sameersbn/gitlab:13.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.10.3
+    sameersbn/gitlab:13.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:sanitize
+    sameersbn/gitlab:13.11.0 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake db:setup
+    sameersbn/gitlab:13.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.3
+docker pull sameersbn/gitlab:13.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.0
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f82ccdb09..fbda4b8d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.10.3
+13.11.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f3432f9a6..f720a133d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 19eb56744..875783f83 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b0c78c17..ab2fecedc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f83e5c0b0..206b36725 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.10.3
+docker pull sameersbn/gitlab:13.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.10.3
+sameersbn/gitlab:13.11.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b9020c6fd..4df2d7949 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 36ba55ff8..a1c83061c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.10.3
+    image: sameersbn/gitlab:13.11.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8d00889a0..73abf04ae 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.10.3
+        image: sameersbn/gitlab:13.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 2a6cddfd886c5c50799efe28cfdc72a239fdec31 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 23 Apr 2021 16:06:14 +0200
Subject: [PATCH 0623/1124] Add missing update for gitlab-pages

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

diff --git a/Dockerfile b/Dockerfile
index 71e0b1a98..a48a9772b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
-    GITLAB_PAGES_VERSION=1.36.0 \
+    GITLAB_PAGES_VERSION=1.38.0 \
     GITALY_SERVER_VERSION=13.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 3382e90f0ce52e4817b4d2c6b0043d5c03cfbcab Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 23 Apr 2021 16:07:45 +0200
Subject: [PATCH 0624/1124] upgrade GitLab CE to 13.11.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a703f795f..0969d91f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.11.1**
+- gitlab: upgrade CE to v13.11.1
+- gitaly: upgrade to v13.11.1
+
 **13.11.0**
 - gitlab: upgrade CE to v13.11.0
 - gitaly: upgrade to v13.11.0
diff --git a/Dockerfile b/Dockerfile
index a48a9772b..7b5b3c61a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210401
 
-ARG VERSION=13.11.0
+ARG VERSION=13.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.38.0 \
-    GITALY_SERVER_VERSION=13.11.0 \
+    GITALY_SERVER_VERSION=13.11.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c4a4455ae..0e01d6302 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.11.0
+# sameersbn/gitlab:13.11.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.0
+docker pull sameersbn/gitlab:13.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.11.0
+ sameersbn/gitlab:13.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.11.0
+    sameersbn/gitlab:13.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:sanitize
+    sameersbn/gitlab:13.11.1 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake db:setup
+    sameersbn/gitlab:13.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.0
+docker pull sameersbn/gitlab:13.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.1
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fbda4b8d7..f35ba5099 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.11.0
+13.11.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f720a133d..e1e7810b1 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 875783f83..b550811cb 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ab2fecedc..36ed42c49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 206b36725..a5b896b72 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.0
+docker pull sameersbn/gitlab:13.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.11.0
+sameersbn/gitlab:13.11.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4df2d7949..6668f1227 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a1c83061c..517799e95 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.0
+    image: sameersbn/gitlab:13.11.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 73abf04ae..d0ef22ca2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.11.0
+        image: sameersbn/gitlab:13.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 9a8e4281030e750b6b9bdda7d67853565342cfdf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 28 Apr 2021 19:53:15 +0200
Subject: [PATCH 0625/1124] upgrade GitLab CE to 13.11.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0969d91f5..25d23c83b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.11.2**
+- gitlab: upgrade CE to v13.11.2
+- gitaly: upgrade to v13.11.2
+
 **13.11.1**
 - gitlab: upgrade CE to v13.11.1
 - gitaly: upgrade to v13.11.1
diff --git a/Dockerfile b/Dockerfile
index 7b5b3c61a..c4eed5637 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210401
 
-ARG VERSION=13.11.1
+ARG VERSION=13.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.38.0 \
-    GITALY_SERVER_VERSION=13.11.1 \
+    GITALY_SERVER_VERSION=13.11.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0e01d6302..9d9490c37 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.11.1
+# sameersbn/gitlab:13.11.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.1
+docker pull sameersbn/gitlab:13.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.11.1
+ sameersbn/gitlab:13.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.11.1
+    sameersbn/gitlab:13.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:sanitize
+    sameersbn/gitlab:13.11.2 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake db:setup
+    sameersbn/gitlab:13.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.1
+docker pull sameersbn/gitlab:13.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.2
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f35ba5099..a62e1ab6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.11.1
+13.11.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e1e7810b1..72c24b5ae 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b550811cb..59f021576 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 36ed42c49..447e4137d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a5b896b72..b7dc0d2a9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.1
+docker pull sameersbn/gitlab:13.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.11.1
+sameersbn/gitlab:13.11.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6668f1227..8f742bc10 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 517799e95..e7e70e93f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.1
+    image: sameersbn/gitlab:13.11.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d0ef22ca2..8ef9d5d84 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.11.1
+        image: sameersbn/gitlab:13.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From bb6a889e0bbd1ee4b3869c6088d6eab28b511518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=20G=C3=A4rtner?= <rene.gaertner@invers.com>
Date: Fri, 30 Apr 2021 14:17:28 +0200
Subject: [PATCH 0626/1124] added OAUTH_AUTO_LINK_USER option

---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 6 ++++++
 assets/runtime/functions                  | 1 +
 3 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 9d9490c37..1f0791326 100644
--- a/README.md
+++ b/README.md
@@ -1021,6 +1021,7 @@ Below is the complete list of available options that can be used to customize yo
 | `OAUTH_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `true`. |
 | `OAUTH_AUTO_LINK_LDAP_USER` | Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. |
 | `OAUTH_AUTO_LINK_SAML_USER` | Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. |
+| `OAUTH_AUTO_LINK_USER` | Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. |
 | `OAUTH_EXTERNAL_PROVIDERS` | Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
 | `OAUTH_CAS3_LABEL` | The "Sign in with" button label. Defaults to "cas3". |
 | `OAUTH_CAS3_SERVER` | CAS3 server URL. No defaults. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index c39311e8a..e2dae1bff 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -883,6 +883,12 @@ production: &base
     # (default: false)
     auto_link_saml_user: {{OAUTH_AUTO_LINK_SAML_USER}}
 
+    # Allow users with existing accounts to login and auto link their account via the
+    # defined Omniauth providers login, without having to do a manual login first and
+    # manually connect their chosen provider.
+    # (default: [])
+    auto_link_user: [{{OAUTH_AUTO_LINK_USER}}]
+
     # Set different Omniauth providers as external so that all users creating accounts
     # via these providers will not be able to have access to internal projects. You
     # will need to use the full name of the provider, like `google_oauth2` for Google.
diff --git a/assets/runtime/functions b/assets/runtime/functions
index c341c3099..28497d46b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -699,6 +699,7 @@ gitlab_configure_oauth() {
     OAUTH_BLOCK_AUTO_CREATED_USERS \
     OAUTH_AUTO_LINK_LDAP_USER \
     OAUTH_AUTO_LINK_SAML_USER \
+    OAUTH_AUTO_LINK_USER \
     OAUTH_EXTERNAL_PROVIDERS
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in

From 8c548066632ee8cfd72d0ae648214ad018effdf5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 1 May 2021 09:18:52 +0200
Subject: [PATCH 0627/1124] upgrade GitLab CE to 13.11.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 25d23c83b..4f903b87d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.11.3**
+- gitlab: upgrade CE to v13.11.3
+- gitaly: upgrade to v13.11.3
+
 **13.11.2**
 - gitlab: upgrade CE to v13.11.2
 - gitaly: upgrade to v13.11.2
diff --git a/Dockerfile b/Dockerfile
index c4eed5637..084217865 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210401
 
-ARG VERSION=13.11.2
+ARG VERSION=13.11.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.3 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.38.0 \
-    GITALY_SERVER_VERSION=13.11.2 \
+    GITALY_SERVER_VERSION=13.11.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9d9490c37..49020230a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.11.2
+# sameersbn/gitlab:13.11.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.2
+docker pull sameersbn/gitlab:13.11.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.11.2
+ sameersbn/gitlab:13.11.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.11.2
+    sameersbn/gitlab:13.11.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:sanitize
+    sameersbn/gitlab:13.11.3 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake db:setup
+    sameersbn/gitlab:13.11.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.11.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.2
+docker pull sameersbn/gitlab:13.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.3
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a62e1ab6d..4b97b1a30 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.11.2
+13.11.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 72c24b5ae..85b54bacd 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 59f021576..d7502c628 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 447e4137d..14fc22a61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b7dc0d2a9..9c406a269 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.2
+docker pull sameersbn/gitlab:13.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.11.2
+sameersbn/gitlab:13.11.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8f742bc10..a0e48e903 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e7e70e93f..19c868954 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.2
+    image: sameersbn/gitlab:13.11.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8ef9d5d84..a08593457 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.11.2
+        image: sameersbn/gitlab:13.11.3
         env:
         - name: TZ
           value: Asia/Kolkata

From d66733c0b4a54bac66a6e7ce78d7a03e16c1a27c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 15 May 2021 08:49:37 +0200
Subject: [PATCH 0628/1124] upgrade GitLab CE to 13.11.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4f903b87d..9538c826d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.11.4**
+- gitlab: upgrade CE to v13.11.4
+- gitaly: upgrade to v13.11.4
+- golang: upgrade to v1.16.4
+- ubuntu: upgrade to focal-20210416
+
 **13.11.3**
 - gitlab: upgrade CE to v13.11.3
 - gitaly: upgrade to v13.11.3
diff --git a/Dockerfile b/Dockerfile
index 084217865..d2dca874e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:focal-20210401
+FROM ubuntu:focal-20210416
 
-ARG VERSION=13.11.3
+ARG VERSION=13.11.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.3 \
+    GOLANG_VERSION=1.16.4 \
     GITLAB_SHELL_VERSION=13.17.0 \
     GITLAB_PAGES_VERSION=1.38.0 \
-    GITALY_SERVER_VERSION=13.11.3 \
+    GITALY_SERVER_VERSION=13.11.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 49020230a..ebdc5dc4b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.11.3
+# sameersbn/gitlab:13.11.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.3
+docker pull sameersbn/gitlab:13.11.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.11.3
+ sameersbn/gitlab:13.11.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.11.3
+    sameersbn/gitlab:13.11.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:sanitize
+    sameersbn/gitlab:13.11.4 app:sanitize
 ```
 
 ### Piwik
@@ -1150,7 +1150,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake db:setup
+    sameersbn/gitlab:13.11.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.11.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.11.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.3
+docker pull sameersbn/gitlab:13.11.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.4
 ```
 
 ## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4b97b1a30..75ef6fe61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.11.3
+13.11.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 85b54bacd..e5f0f8796 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d7502c628..f98341770 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 14fc22a61..1e89a0f8b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9c406a269..6aa3bc8e3 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.3
+docker pull sameersbn/gitlab:13.11.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.11.3
+sameersbn/gitlab:13.11.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a0e48e903..8799624d4 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 19c868954..f6e30d7dd 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.3
+    image: sameersbn/gitlab:13.11.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a08593457..9700a84e7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.11.3
+        image: sameersbn/gitlab:13.11.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 6419d3378d376ba8afa2ddd722958a4d47659830 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 23 May 2021 10:23:29 +0200
Subject: [PATCH 0629/1124] upgrade GitLab CE to 13.12.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9538c826d..c0436d576 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.12.0**
+- gitlab: upgrade CE to v13.12.0
+- gitlab-shell: upgrade to v13.18.0
+- gitlab-pages: upgrade to v1.39.0
+- gitaly: upgrade to v13.12.0
+
 **13.11.4**
 - gitlab: upgrade CE to v13.11.4
 - gitaly: upgrade to v13.11.4
diff --git a/Dockerfile b/Dockerfile
index d2dca874e..20f696701 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210416
 
-ARG VERSION=13.11.4
+ARG VERSION=13.12.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.4 \
-    GITLAB_SHELL_VERSION=13.17.0 \
-    GITLAB_PAGES_VERSION=1.38.0 \
-    GITALY_SERVER_VERSION=13.11.4 \
+    GITLAB_SHELL_VERSION=13.18.0 \
+    GITLAB_PAGES_VERSION=1.39.0 \
+    GITALY_SERVER_VERSION=13.12.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0d6715d9d..abaf9ebb6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.11.4
+# sameersbn/gitlab:13.12.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.4
+docker pull sameersbn/gitlab:13.12.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.11.4
+ sameersbn/gitlab:13.12.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.11.4
+    sameersbn/gitlab:13.12.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:sanitize
+    sameersbn/gitlab:13.12.0 app:sanitize
 ```
 
 ### Piwik
@@ -1151,7 +1151,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1186,14 +1186,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake db:setup
+    sameersbn/gitlab:13.12.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.11.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.4
+docker pull sameersbn/gitlab:13.12.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.0
 ```
 
 ## Shell Access
@@ -1389,7 +1389,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 75ef6fe61..6665a53d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.11.4
+13.12.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e5f0f8796..e97b91444 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f98341770..27c9f4f15 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e89a0f8b..b132c59c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6aa3bc8e3..5fe83317c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.11.4
+docker pull sameersbn/gitlab:13.12.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.11.4
+sameersbn/gitlab:13.12.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8799624d4..ce964d935 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f6e30d7dd..f38a9158f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.11.4
+    image: sameersbn/gitlab:13.12.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9700a84e7..bc68cfb0d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.11.4
+        image: sameersbn/gitlab:13.12.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 358a73344a4e40b7d3db08b49bff00220414a3c4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 26 May 2021 20:16:42 +0200
Subject: [PATCH 0630/1124] upgrade Gitlab CE to 13.12.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c0436d576..ab99a0b41 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.12.1**
+- gitlab: upgrade CE to v13.12.1
+- gitaly: upgrade to v13.12.1
+
 **13.12.0**
 - gitlab: upgrade CE to v13.12.0
 - gitlab-shell: upgrade to v13.18.0
diff --git a/Dockerfile b/Dockerfile
index 20f696701..99f11ef58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210416
 
-ARG VERSION=13.12.0
+ARG VERSION=13.12.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.4 \
     GITLAB_SHELL_VERSION=13.18.0 \
     GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.0 \
+    GITALY_SERVER_VERSION=13.12.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index abaf9ebb6..20781d7f7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.0
+# sameersbn/gitlab:13.12.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.0
+docker pull sameersbn/gitlab:13.12.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.0
+ sameersbn/gitlab:13.12.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.0
+    sameersbn/gitlab:13.12.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:sanitize
+    sameersbn/gitlab:13.12.1 app:sanitize
 ```
 
 ### Piwik
@@ -1151,7 +1151,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1186,14 +1186,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake db:setup
+    sameersbn/gitlab:13.12.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.0
+docker pull sameersbn/gitlab:13.12.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.1
 ```
 
 ## Shell Access
@@ -1389,7 +1389,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6665a53d3..05d5d0f4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.0
+13.12.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e97b91444..46ab1abb4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 27c9f4f15..d7b22f59a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b132c59c0..b862824c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5fe83317c..7e68ea61c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.0
+docker pull sameersbn/gitlab:13.12.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.0
+sameersbn/gitlab:13.12.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ce964d935..fbcae6dee 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f38a9158f..b6a2d097a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.0
+    image: sameersbn/gitlab:13.12.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bc68cfb0d..1d3269487 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.0
+        image: sameersbn/gitlab:13.12.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 8fde44f93ee4a21f3e592ab42b1e14737a291021 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 2 Jun 2021 16:18:34 +0200
Subject: [PATCH 0631/1124] upgrade GitLab CE to 13.12.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ab99a0b41..3c019b569 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.12.1**
+- gitlab: upgrade CE to v13.12.2
+- gitaly: upgrade to v13.12.2
+
 **13.12.1**
 - gitlab: upgrade CE to v13.12.1
 - gitaly: upgrade to v13.12.1
diff --git a/Dockerfile b/Dockerfile
index 99f11ef58..4abc89295 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210416
 
-ARG VERSION=13.12.1
+ARG VERSION=13.12.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.4 \
     GITLAB_SHELL_VERSION=13.18.0 \
     GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.1 \
+    GITALY_SERVER_VERSION=13.12.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 20781d7f7..3f07010e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.1
+# sameersbn/gitlab:13.12.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.1
+docker pull sameersbn/gitlab:13.12.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.1
+ sameersbn/gitlab:13.12.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.1
+    sameersbn/gitlab:13.12.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:sanitize
+    sameersbn/gitlab:13.12.2 app:sanitize
 ```
 
 ### Piwik
@@ -1151,7 +1151,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1186,14 +1186,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake db:setup
+    sameersbn/gitlab:13.12.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.1
+docker pull sameersbn/gitlab:13.12.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.2
 ```
 
 ## Shell Access
@@ -1389,7 +1389,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 05d5d0f4a..87c9416fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.1
+13.12.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 46ab1abb4..5fa3171f5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d7b22f59a..e0c2d33e1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b862824c0..669ea5c77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7e68ea61c..cdb826ae8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.1
+docker pull sameersbn/gitlab:13.12.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.1
+sameersbn/gitlab:13.12.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fbcae6dee..1d3eb9fac 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b6a2d097a..4cf61b5ea 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.1
+    image: sameersbn/gitlab:13.12.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1d3269487..29bc96e6d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.1
+        image: sameersbn/gitlab:13.12.2
         env:
         - name: TZ
           value: Asia/Kolkata

From bda490f5086daab0bdb9dc6f4d2cc99e5a947ecf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 8 Jun 2021 06:02:18 +0200
Subject: [PATCH 0632/1124] upgrade GitLab CE to 13.12.3

---
 Changelog.md                            |  7 +++-
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3c019b569..9b8e02b9b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**13.12.1**
+**13.12.3**
+- gitlab: upgrade CE to v13.12.3
+- gitaly: upgrade to v13.12.3
+- golang: upgrade to v1.16.5
+
+**13.12.2**
 - gitlab: upgrade CE to v13.12.2
 - gitaly: upgrade to v13.12.2
 
diff --git a/Dockerfile b/Dockerfile
index 4abc89295..c3c018511 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210416
 
-ARG VERSION=13.12.2
+ARG VERSION=13.12.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.4 \
+    GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.18.0 \
     GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.2 \
+    GITALY_SERVER_VERSION=13.12.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3f07010e3..bbde935e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.2
+# sameersbn/gitlab:13.12.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.2
+docker pull sameersbn/gitlab:13.12.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.2
+ sameersbn/gitlab:13.12.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.2
+    sameersbn/gitlab:13.12.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:sanitize
+    sameersbn/gitlab:13.12.3 app:sanitize
 ```
 
 ### Piwik
@@ -1151,7 +1151,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1186,14 +1186,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake db:setup
+    sameersbn/gitlab:13.12.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.2
+docker pull sameersbn/gitlab:13.12.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.3
 ```
 
 ## Shell Access
@@ -1389,7 +1389,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 87c9416fd..b5362cc92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.2
+13.12.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5fa3171f5..2ac19fbbc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e0c2d33e1..78635ae4f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 669ea5c77..8eac4898c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cdb826ae8..ee0074b24 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.2
+docker pull sameersbn/gitlab:13.12.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.2
+sameersbn/gitlab:13.12.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1d3eb9fac..13cd591e3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4cf61b5ea..9254a0b03 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.2
+    image: sameersbn/gitlab:13.12.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 29bc96e6d..652b69cde 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.2
+        image: sameersbn/gitlab:13.12.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 0336ee90abdfded15d3f442e455ab0e84b6b4724 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 15 Jun 2021 06:04:27 +0200
Subject: [PATCH 0633/1124] upgrade GitLab CE to 13.12.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9b8e02b9b..8ee3e0b75 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.12.4**
+- gitlab: upgrade CE to v13.12.4
+- gitaly: upgrade to v13.12.4
+
 **13.12.3**
 - gitlab: upgrade CE to v13.12.3
 - gitaly: upgrade to v13.12.3
diff --git a/Dockerfile b/Dockerfile
index c3c018511..39b464c22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210416
 
-ARG VERSION=13.12.3
+ARG VERSION=13.12.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.18.0 \
     GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.3 \
+    GITALY_SERVER_VERSION=13.12.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bbde935e3..49118cbb3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.3
+# sameersbn/gitlab:13.12.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.3
+docker pull sameersbn/gitlab:13.12.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.3
+ sameersbn/gitlab:13.12.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.3
+    sameersbn/gitlab:13.12.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:sanitize
+    sameersbn/gitlab:13.12.4 app:sanitize
 ```
 
 ### Piwik
@@ -1151,7 +1151,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1186,14 +1186,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake db:setup
+    sameersbn/gitlab:13.12.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.3
+docker pull sameersbn/gitlab:13.12.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.4
 ```
 
 ## Shell Access
@@ -1389,7 +1389,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b5362cc92..4e148f624 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.3
+13.12.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2ac19fbbc..bea99b292 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 78635ae4f..9f57c72f2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 8eac4898c..60bae6e27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ee0074b24..a68b860de 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.3
+docker pull sameersbn/gitlab:13.12.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.3
+sameersbn/gitlab:13.12.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 13cd591e3..f874d8f4d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 9254a0b03..657d1531a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.3
+    image: sameersbn/gitlab:13.12.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 652b69cde..29be1fba6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.3
+        image: sameersbn/gitlab:13.12.4
         env:
         - name: TZ
           value: Asia/Kolkata

From c2ed0e60335f7ebf3619dba267f052be8238ab6e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 22 Jun 2021 05:55:37 +0200
Subject: [PATCH 0634/1124] upgrade GitLab CE to 13.12.5

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8ee3e0b75..80002ee24 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**13.12.5**
+- gitlab: upgrade CE to v13.12.5
+- gitaly: upgrade to v13.12.5
+- ubuntu: upgrade to focal-20210609
+
 **13.12.4**
 - gitlab: upgrade CE to v13.12.4
 - gitaly: upgrade to v13.12.4
diff --git a/Dockerfile b/Dockerfile
index 39b464c22..bb41a4348 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210609
 
-ARG VERSION=13.12.4
+ARG VERSION=13.12.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.18.0 \
     GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.4 \
+    GITALY_SERVER_VERSION=13.12.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a4c3cc873..6165d31b9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.4
+# sameersbn/gitlab:13.12.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.4
+docker pull sameersbn/gitlab:13.12.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.4
+ sameersbn/gitlab:13.12.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.4
+    sameersbn/gitlab:13.12.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:sanitize
+    sameersbn/gitlab:13.12.5 app:sanitize
 ```
 
 ### Piwik
@@ -1152,7 +1152,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1187,14 +1187,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake db:setup
+    sameersbn/gitlab:13.12.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1203,7 +1203,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1253,7 +1253,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:env:info
+    sameersbn/gitlab:13.12.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1266,7 +1266,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1297,7 +1297,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1321,12 +1321,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:13.12.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.4
+docker pull sameersbn/gitlab:13.12.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1352,7 +1352,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.5
 ```
 
 ## Shell Access
@@ -1390,7 +1390,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4e148f624..44d9ed739 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.4
+13.12.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index bea99b292..40322d578 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9f57c72f2..99f5ddb32 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 60bae6e27..6debc3807 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a68b860de..771d0d8d5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.4
+docker pull sameersbn/gitlab:13.12.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.4
+sameersbn/gitlab:13.12.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f874d8f4d..57424b1e6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 657d1531a..4d1e38812 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.4
+    image: sameersbn/gitlab:13.12.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 29be1fba6..c05fad74d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.4
+        image: sameersbn/gitlab:13.12.5
         env:
         - name: TZ
           value: Asia/Kolkata

From def519997c18476e56267b4e9dbf2c30875666d2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 22 Jun 2021 17:30:43 +0200
Subject: [PATCH 0635/1124] upgrade GitLab CE to 14.0.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 80002ee24..7c029ab2d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.0**
+- gitlab: upgrade CE to v14.0.0
+- gitaly: upgrade to v14.0.0
+- gitlab-shell: upgrade to v13.19.0
+- gitlab-pages: upgrade to v1.40.0
+
 **13.12.5**
 - gitlab: upgrade CE to v13.12.5
 - gitaly: upgrade to v13.12.5
diff --git a/Dockerfile b/Dockerfile
index bb41a4348..ee4648bc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=13.12.5
+ARG VERSION=14.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
-    GITLAB_SHELL_VERSION=13.18.0 \
-    GITLAB_PAGES_VERSION=1.39.0 \
-    GITALY_SERVER_VERSION=13.12.5 \
+    GITLAB_SHELL_VERSION=13.19.0 \
+    GITLAB_PAGES_VERSION=1.40.0 \
+    GITALY_SERVER_VERSION=14.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6165d31b9..16ae5da27 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:13.12.5
+# sameersbn/gitlab:14.0.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.5
+docker pull sameersbn/gitlab:14.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:13.12.5
+ sameersbn/gitlab:14.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:13.12.5
+    sameersbn/gitlab:14.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:sanitize
+    sameersbn/gitlab:14.0.0 app:sanitize
 ```
 
 ### Piwik
@@ -1152,7 +1152,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1187,14 +1187,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake db:setup
+    sameersbn/gitlab:14.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1203,7 +1203,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1253,7 +1253,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1266,7 +1266,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1297,7 +1297,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1321,12 +1321,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:13.12.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.5
+docker pull sameersbn/gitlab:14.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1352,7 +1352,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.0
 ```
 
 ## Shell Access
@@ -1390,7 +1390,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 44d9ed739..4b964e965 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.5
+14.0.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 40322d578..36b96063e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 99f5ddb32..8fd240467 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6debc3807..6b1506994 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 771d0d8d5..62e210d62 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:13.12.5
+docker pull sameersbn/gitlab:14.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:13.12.5
+sameersbn/gitlab:14.0.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 57424b1e6..43bfc0deb 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4d1e38812..49906e633 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:13.12.5
+    image: sameersbn/gitlab:14.0.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c05fad74d..3da9aff77 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:13.12.5
+        image: sameersbn/gitlab:14.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 19f8c4927ef8ae9a01d107fb80f173a91dd9301d Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 23 Jun 2021 11:11:37 +0530
Subject: [PATCH 0636/1124] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9c25e3119..dd1d3b2c3 100644
--- a/README.md
+++ b/README.md
@@ -179,8 +179,8 @@ Step 2. Launch a redis container
 
 ```bash
 docker run --name gitlab-redis -d \
-    --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    redis:5.0.9
+    --volume /srv/docker/gitlab/redis:/data \
+    redis:6.2
 ```
 
 Step 3. Launch the gitlab container
@@ -354,20 +354,20 @@ docker run --name gitlab -it --rm \
 
 You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image.
 
-To illustrate linking with a redis container, we will use the [sameersbn/redis](https://github.com/sameersbn/docker-redis) image. Please refer the [README](https://github.com/sameersbn/docker-redis/blob/master/README.md) of docker-redis for details.
+To illustrate linking with a redis container, we will use the [redis](https://github.com/docker-library/redis) image. Please refer the [README](https://github.com/docker-library/docs/blob/master/redis/README.md) for details.
 
 First, lets pull the redis image from the docker index.
 
 ```bash
-docker pull redis:5.0.9
+docker pull redis:6.2
 ```
 
 Lets start the redis container
 
 ```bash
 docker run --name gitlab-redis -d \
-    --volume /srv/docker/gitlab/redis:/var/lib/redis \
-    redis:5.0.9
+    --volume /srv/docker/gitlab/redis:/data \
+    redis:6.2
 ```
 
 We are now ready to start the GitLab application.

From 0ba02c4881d4c46aba95c56c4ab70c2016a08289 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 23 Jun 2021 11:13:01 +0530
Subject: [PATCH 0637/1124] Update docker-compose.yml

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4d9645786..00535faa7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:5.0.9
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
-    - redis-data:/var/lib/redis:Z
+    - redis-data:/data:Z
 
   postgresql:
     restart: always

From 8ce166bfd1a56842052cccb58a77253ad71d8451 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 23 Jun 2021 11:14:29 +0530
Subject: [PATCH 0638/1124] Update s3_compatible_storage.md

---
 docs/s3_compatible_storage.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 1a4914109..b6e9f3db8 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -72,11 +72,11 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:4.0.9-2
+    image: sameersbn/redis:6.2
     command:
     - --loglevel warning
     volumes:
-    - /tmp/docker/gitlab/redis:/var/lib/redis:Z
+    - /tmp/docker/gitlab/redis:/data:Z
 
   postgresql:
     restart: always

From 2472f6c8543aa9d5aee91321e7c978dca865adeb Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 25 Jun 2021 21:46:48 +0200
Subject: [PATCH 0639/1124] upgrade GitLab CE to 14.0.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7c029ab2d..315d66a67 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.1**
+- gitlab: upgrade CE to v14.0.1
+- gitaly: upgrade to v14.0.1
+
 **14.0.0**
 - gitlab: upgrade CE to v14.0.0
 - gitaly: upgrade to v14.0.0
diff --git a/Dockerfile b/Dockerfile
index ee4648bc9..89876de1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.0
+ARG VERSION=14.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.0 \
+    GITALY_SERVER_VERSION=14.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 79af36c2a..cb903f331 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.0
+# sameersbn/gitlab:14.0.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.0
+docker pull sameersbn/gitlab:14.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.0
+ sameersbn/gitlab:14.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.0
+    sameersbn/gitlab:14.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:sanitize
+    sameersbn/gitlab:14.0.1 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1206,14 +1206,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake db:setup
+    sameersbn/gitlab:14.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1222,7 +1222,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1272,7 +1272,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1285,7 +1285,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1316,7 +1316,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1340,12 +1340,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.0
+docker pull sameersbn/gitlab:14.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1371,7 +1371,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.1
 ```
 
 ## Shell Access
@@ -1409,7 +1409,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4b964e965..63dba868a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.0
+14.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 36b96063e..92c5e3eee 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8fd240467..c3eb96cef 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6596dbff7..595a8fdde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 62e210d62..1b1dd21d2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.0
+docker pull sameersbn/gitlab:14.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.0
+sameersbn/gitlab:14.0.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 43bfc0deb..10988c8bc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 49906e633..8d0753286 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.0
+    image: sameersbn/gitlab:14.0.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3da9aff77..33421ebd4 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.0
+        image: sameersbn/gitlab:14.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 9180bed1fe1428ab0222825c4b78090e45c9d0c4 Mon Sep 17 00:00:00 2001
From: Gert-Jan Timmer <gjr.timmer@gmail.com>
Date: Thu, 8 Nov 2018 16:26:06 +0100
Subject: [PATCH 0640/1124] fix Container TimeZone

Fix Container TimeZone


Fix Container TimeZone
---
 README.md                |  3 ++-
 assets/runtime/functions | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cb903f331..f42089b31 100644
--- a/README.md
+++ b/README.md
@@ -781,13 +781,14 @@ Below is the complete list of available options that can be used to customize yo
 | Parameter | Description |
 |-----------|-------------|
 | `DEBUG` | Set this to `true` to enable entrypoint debugging. |
+| `TZ` | Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam`  See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. |
 | `GITLAB_HOST` | The hostname of the GitLab server. Defaults to `localhost` |
 | `GITLAB_CI_HOST` | If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. |
 | `GITLAB_PORT` | The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. |
 | `GITLAB_SECRETS_DB_KEY_BASE` | Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. |
 | `GITLAB_SECRETS_SECRET_KEY_BASE` | Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. |
 | `GITLAB_SECRETS_OTP_KEY_BASE` |  Encryption key for OTP related stuff with  GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. |
-| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). |
+| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` |
 | `GITLAB_ROOT_PASSWORD` | The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. |
 | `GITLAB_ROOT_EMAIL` | The email for the root user on firstrun. Defaults to `admin@example.com` |
 | `GITLAB_EMAIL` | The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. |
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 18bc8d524..82beafc10 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1561,6 +1561,23 @@ EOF
   chmod +x /usr/local/sbin/healthcheck
 }
 
+configure_container_timezone() {
+  TIMEZONE=${TZ:-UTC}
+
+  # Preform sanity check of provided timezone value
+  if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then
+    # Configured timezone is available
+
+    # Set localtime
+    ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
+
+    # Set timezone
+    echo ${TIMEZONE} > /etc/timezone
+
+    echo "Container TimeZone -> ${TIMEZONE}"
+  fi
+}
+
 initialize_system() {
   map_uidgid
   initialize_logdir
@@ -1568,6 +1585,7 @@ initialize_system() {
   update_ca_certificates
   generate_ssh_host_keys
   update_ssh_listen_port
+  configure_container_timezone
   install_configuration_templates
   rm -rf /var/run/supervisor.sock
 }

From e194e7d8d01da6b5d845ebe81a8de77531018899 Mon Sep 17 00:00:00 2001
From: "G.J.R. Timmer" <gjr.timmer@gmail.com>
Date: Fri, 2 Oct 2020 13:37:13 +0200
Subject: [PATCH 0641/1124] moved default TIMEZONE variable to env-defaults

Resolve conversation
---
 assets/runtime/env-defaults | 2 ++
 assets/runtime/functions    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index a2967a53f..ad1ebc18f 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -1,6 +1,8 @@
 #!/bin/bash
 
+# CONTAINER
 DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT}
+TIMEZONE=${TZ:-UTC}
 
 ## GITLAB CORE
 GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp"
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 82beafc10..5d1d0a2b2 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1562,8 +1562,6 @@ EOF
 }
 
 configure_container_timezone() {
-  TIMEZONE=${TZ:-UTC}
-
   # Preform sanity check of provided timezone value
   if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then
     # Configured timezone is available

From 6ed4aa776ce1a387f3668185ac0ba5605f28517f Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 10 Mar 2021 10:34:07 +0530
Subject: [PATCH 0642/1124] fixed typo

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5d1d0a2b2..c0561674e 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1562,7 +1562,7 @@ EOF
 }
 
 configure_container_timezone() {
-  # Preform sanity check of provided timezone value
+  # Perform sanity check of provided timezone value
   if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then
     # Configured timezone is available
 

From a493ca37ab681e1c2ea9fcd3a092541c82f31193 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 1 Jul 2021 20:55:10 +0200
Subject: [PATCH 0643/1124] upgrade GitLab CE to 14.0.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 315d66a67..7e23246a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.2**
+- gitlab: upgrade CE to v14.0.2
+- gitaly: upgrade to v14.0.2
+
 **14.0.1**
 - gitlab: upgrade CE to v14.0.1
 - gitaly: upgrade to v14.0.1
diff --git a/Dockerfile b/Dockerfile
index 89876de1d..0d566b7c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.1
+ARG VERSION=14.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.1 \
+    GITALY_SERVER_VERSION=14.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index cb903f331..e5b1d1181 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.1
+# sameersbn/gitlab:14.0.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.1
+docker pull sameersbn/gitlab:14.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.1
+ sameersbn/gitlab:14.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.1
+    sameersbn/gitlab:14.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:sanitize
+    sameersbn/gitlab:14.0.2 app:sanitize
 ```
 
 ### Piwik
@@ -1171,7 +1171,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1206,14 +1206,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake db:setup
+    sameersbn/gitlab:14.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1222,7 +1222,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1272,7 +1272,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1285,7 +1285,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1316,7 +1316,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1340,12 +1340,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.1
+docker pull sameersbn/gitlab:14.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1371,7 +1371,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.2
 ```
 
 ## Shell Access
@@ -1409,7 +1409,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 63dba868a..be44f252a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.1
+14.0.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 92c5e3eee..b2b6743ab 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c3eb96cef..f8a6f0292 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 595a8fdde..c078f060e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1b1dd21d2..7ba999015 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.1
+docker pull sameersbn/gitlab:14.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.1
+sameersbn/gitlab:14.0.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 10988c8bc..aa4a72a94 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8d0753286..5e0383c52 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.1
+    image: sameersbn/gitlab:14.0.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 33421ebd4..05fc2e216 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.1
+        image: sameersbn/gitlab:14.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 0265fc72d73aefa1fe1858618c4751a8b26dd303 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 7 Jul 2021 17:46:52 +0200
Subject: [PATCH 0644/1124] upgrade GitLab CE to 14.0.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7e23246a9..173bccde7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.3**
+- gitlab: upgrade CE to v14.0.3
+- gitaly: upgrade to v14.0.3
+
 **14.0.2**
 - gitlab: upgrade CE to v14.0.2
 - gitaly: upgrade to v14.0.2
diff --git a/Dockerfile b/Dockerfile
index 0d566b7c1..e2bb39e88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.2
+ARG VERSION=14.0.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.2 \
+    GITALY_SERVER_VERSION=14.0.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 677a27693..0dbe98bc0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.2
+# sameersbn/gitlab:14.0.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.2
+docker pull sameersbn/gitlab:14.0.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.2
+ sameersbn/gitlab:14.0.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.2
+    sameersbn/gitlab:14.0.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:sanitize
+    sameersbn/gitlab:14.0.3 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake db:setup
+    sameersbn/gitlab:14.0.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1273,7 +1273,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.2
+docker pull sameersbn/gitlab:14.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.3
 ```
 
 ## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index be44f252a..de29f6758 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.2
+14.0.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b2b6743ab..cf1db44b7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f8a6f0292..564921f1b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c078f060e..3e7867e6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7ba999015..895442aa2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.2
+docker pull sameersbn/gitlab:14.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.2
+sameersbn/gitlab:14.0.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index aa4a72a94..58256bd1f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 5e0383c52..dd8d8018f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.2
+    image: sameersbn/gitlab:14.0.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 05fc2e216..615499697 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.2
+        image: sameersbn/gitlab:14.0.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 366a6e1d2538e69390a7ca2dfd727bf4b758df57 Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Thu, 8 Jul 2021 08:43:53 +0200
Subject: [PATCH 0645/1124] upgrade GitLab CE to 14.0.4

---
 Changelog.md                            |  4 ++++
 Dockerfile                              |  4 ++--
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 +++++-----
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 173bccde7..ce74f5281 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.4**
+- gitlab: upgrade CE to v14.0.4
+- gitaly: upgrade to v14.0.4
+
 **14.0.3**
 - gitlab: upgrade CE to v14.0.3
 - gitaly: upgrade to v14.0.3
diff --git a/Dockerfile b/Dockerfile
index e2bb39e88..6dfa6657b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.3
+ARG VERSION=14.0.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.3 \
+    GITALY_SERVER_VERSION=14.0.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/VERSION b/VERSION
index de29f6758..560dec006 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.3
+14.0.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cf1db44b7..222735621 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 564921f1b..f9085b020 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e7867e6d..838e4c394 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 895442aa2..7c8ae4255 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.3
+docker pull sameersbn/gitlab:14.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.3
+sameersbn/gitlab:14.0.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 58256bd1f..315866e85 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index dd8d8018f..919bae4bd 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 615499697..4d5b51de6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.3
+        image: sameersbn/gitlab:14.0.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 47bc7989876898b30ce099564d0a651f73c071fa Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 8 Jul 2021 19:30:36 +0200
Subject: [PATCH 0646/1124] Add missing adjustments to README.md

---
 README.md | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 0dbe98bc0..54dadb226 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.3
+# sameersbn/gitlab:14.0.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.3
+docker pull sameersbn/gitlab:14.0.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.3
+ sameersbn/gitlab:14.0.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.3
+    sameersbn/gitlab:14.0.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:sanitize
+    sameersbn/gitlab:14.0.4 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake db:setup
+    sameersbn/gitlab:14.0.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1273,7 +1273,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.3
+docker pull sameersbn/gitlab:14.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.4
 ```
 
 ## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.3
+    image: sameersbn/gitlab:14.0.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m

From 5c8526955fdac74cb4a00f2c9c53385a65af4c10 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 8 Jul 2021 19:23:36 +0200
Subject: [PATCH 0647/1124] upgrade GitLab CE to 14.0.5

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ce74f5281..2b9041c98 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.5**
+- gitlab: upgrade CE to v14.0.5
+- gitaly: upgrade to v14.0.5
+
 **14.0.4**
 - gitlab: upgrade CE to v14.0.4
 - gitaly: upgrade to v14.0.4
diff --git a/Dockerfile b/Dockerfile
index 6dfa6657b..b7007e0f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.4
+ARG VERSION=14.0.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.5 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.4 \
+    GITALY_SERVER_VERSION=14.0.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 54dadb226..823ac2670 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.4
+# sameersbn/gitlab:14.0.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.4
+docker pull sameersbn/gitlab:14.0.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.4
+ sameersbn/gitlab:14.0.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.4
+    sameersbn/gitlab:14.0.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:sanitize
+    sameersbn/gitlab:14.0.5 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake db:setup
+    sameersbn/gitlab:14.0.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1273,7 +1273,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.4
+docker pull sameersbn/gitlab:14.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.5
 ```
 
 ## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 560dec006..1327813cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.4
+14.0.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 222735621..ca142d39b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f9085b020..67058c7e8 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 838e4c394..5867bbba4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7c8ae4255..5a0a619be 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.4
+docker pull sameersbn/gitlab:14.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.4
+sameersbn/gitlab:14.0.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 315866e85..3a155271b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 919bae4bd..81d13ad4c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.4
+    image: sameersbn/gitlab:14.0.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4d5b51de6..6f51ac2a5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.4
+        image: sameersbn/gitlab:14.0.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 50bad158454f4ee5f592b77fb83778065329508b Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Tue, 20 Jul 2021 18:20:33 +0900
Subject: [PATCH 0648/1124] Resolved. GitLab Pages doesn't work since GitLab
 v14.0

ref. #2375

As I can see from the error message below, it looks like both
`api-secret-key` and `gitlab-server` (or `internal-gitlab-server` ) are required since GitLab v14.0

```
time="2021-06-28T02:28:34Z" level=fatal msg="could not create domains config source" error="GitLab API URL or API secret has not been provided"
```

https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v1.41.0/internal/source/gitlab/client/client.go#L50-52
---
 assets/runtime/config/gitlab-pages/config | 2 ++
 assets/runtime/functions                  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
index 8b0edb605..f98fe4d17 100644
--- a/assets/runtime/config/gitlab-pages/config
+++ b/assets/runtime/config/gitlab-pages/config
@@ -4,3 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
 auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
 artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
+internal-gitlab-server=http://localhost:8181
+api-secret-key=/home/git/gitlab/.gitlab_pages_secret
diff --git a/assets/runtime/functions b/assets/runtime/functions
index c0561674e..dc82cb43b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -752,6 +752,12 @@ gitlab_configure_secrets() {
     exec_as_git openssl rand -base64 -out "${workhorse_secret}" 32
     chmod 600 "${workhorse_secret}"
   fi
+
+  local pages_secret="${GITLAB_INSTALL_DIR}/.gitlab_pages_secret"
+  if [[ ! -f "${pages_secret}" ]]; then
+    exec_as_git openssl rand -base64 -out "${pages_secret}" 32
+    chmod 600 "${pages_secret}"
+  fi
 }
 
 gitlab_configure_sidekiq() {

From 73dae28e31167ff16539f31959a7a7fe9cd439d5 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Wed, 21 Jul 2021 09:38:37 +0900
Subject: [PATCH 0649/1124] Pass {{GITLAB_INSTALL_DIR}} to gitlab-pages/config

---
 assets/runtime/config/gitlab-pages/config | 2 +-
 assets/runtime/functions                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
index f98fe4d17..409786090 100644
--- a/assets/runtime/config/gitlab-pages/config
+++ b/assets/runtime/config/gitlab-pages/config
@@ -5,4 +5,4 @@ auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
 artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
 internal-gitlab-server=http://localhost:8181
-api-secret-key=/home/git/gitlab/.gitlab_pages_secret
+api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
diff --git a/assets/runtime/functions b/assets/runtime/functions
index dc82cb43b..cd5f501ff 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1792,7 +1792,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_CLIENT_SECRET \
       GITLAB_PAGES_ACCESS_REDIRECT_URI \
       GITLAB_PAGES_ACCESS_SECRET \
-      GITLAB_PAGES_ACCESS_CONTROL_SERVER
+      GITLAB_PAGES_ACCESS_CONTROL_SERVER \
+      GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
     update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL

From 206baef0ded64ddd1a2d218b3c3cc7d178c348b4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 21 Jul 2021 20:53:59 +0200
Subject: [PATCH 0650/1124] upgrade GitLab CE to 14.0.6

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2b9041c98..5fdd5517c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.0.6**
+- gitlab: upgrade CE to v14.0.6
+- gitaly: upgrade to v14.0.6
+- golang: upgrade to v1.16.6
+
 **14.0.5**
 - gitlab: upgrade CE to v14.0.5
 - gitaly: upgrade to v14.0.5
diff --git a/Dockerfile b/Dockerfile
index b7007e0f8..4d7622ef1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.5
+ARG VERSION=14.0.6
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.5 \
+    GOLANG_VERSION=1.16.6 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.5 \
+    GITALY_SERVER_VERSION=14.0.6 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 823ac2670..9c4439723 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.5
+# sameersbn/gitlab:14.0.6
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.5
+docker pull sameersbn/gitlab:14.0.6
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.5
+ sameersbn/gitlab:14.0.6
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.5
+    sameersbn/gitlab:14.0.6
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:sanitize
+    sameersbn/gitlab:14.0.6 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake db:setup
+    sameersbn/gitlab:14.0.6 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1273,7 +1273,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:env:info
+    sameersbn/gitlab:14.0.6 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.0.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.5
+docker pull sameersbn/gitlab:14.0.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.6
 ```
 
 ## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1327813cb..122855f1d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.5
+14.0.6
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ca142d39b..bf941a757 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 67058c7e8..7c9990910 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5867bbba4..fd6c87653 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5a0a619be..2b56ab78a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.5
+docker pull sameersbn/gitlab:14.0.6
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.5
+sameersbn/gitlab:14.0.6
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3a155271b..82c8f1ab2 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 81d13ad4c..540a36f72 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.5
+    image: sameersbn/gitlab:14.0.6
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6f51ac2a5..13a6abf96 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.5
+        image: sameersbn/gitlab:14.0.6
         env:
         - name: TZ
           value: Asia/Kolkata

From a07ca15aa4eb995dedff68380b4d0ace0f661c92 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 24 Jul 2021 10:11:07 +0200
Subject: [PATCH 0651/1124] upgrade GitLab CE to 14.1.0

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5fdd5517c..4bbb28e2a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.1.0**
+- gitlab: upgrade CE to v14.1.0
+- gitaly: upgrade to v14.1.0
+
 **14.0.6**
 - gitlab: upgrade CE to v14.0.6
 - gitaly: upgrade to v14.0.6
diff --git a/Dockerfile b/Dockerfile
index 4d7622ef1..547861a8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210609
 
-ARG VERSION=14.0.6
+ARG VERSION=14.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.6 \
     GITLAB_SHELL_VERSION=13.19.0 \
-    GITLAB_PAGES_VERSION=1.40.0 \
-    GITALY_SERVER_VERSION=14.0.6 \
+    GITLAB_PAGES_VERSION=1.41.0 \
+    GITALY_SERVER_VERSION=14.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9c4439723..3690a4fac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.0.6
+# sameersbn/gitlab:14.1.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.6
+docker pull sameersbn/gitlab:14.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.0.6
+ sameersbn/gitlab:14.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.0.6
+    sameersbn/gitlab:14.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:sanitize
+    sameersbn/gitlab:14.1.0 app:sanitize
 ```
 
 ### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake db:setup
+    sameersbn/gitlab:14.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1273,7 +1273,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:env:info
+    sameersbn/gitlab:14.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.0.6` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.6
+docker pull sameersbn/gitlab:14.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.6
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.0
 ```
 
 ## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 122855f1d..7b3b6e02b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.6
+14.1.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index bf941a757..9e3c24be5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7c9990910..b3e815e50 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fd6c87653..415208015 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2b56ab78a..3a8ad568c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.0.6
+docker pull sameersbn/gitlab:14.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.0.6
+sameersbn/gitlab:14.1.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 82c8f1ab2..4a2281d38 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 540a36f72..32093a8a5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.0.6
+    image: sameersbn/gitlab:14.1.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 13a6abf96..3fbfeb88f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.0.6
+        image: sameersbn/gitlab:14.1.0
         env:
         - name: TZ
           value: Asia/Kolkata

From cce452ba97e65a9e8de253b9e3bbc8879e6ccb52 Mon Sep 17 00:00:00 2001
From: Carlos Leite <carlos.leite@znc.com.br>
Date: Sun, 25 Jul 2021 08:25:00 -0300
Subject: [PATCH 0652/1124] Fix #2392 - update comments about "_gitlab-data"
 volume mount point.

---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9c4439723..365b74241 100644
--- a/README.md
+++ b/README.md
@@ -215,7 +215,7 @@ GitLab is a code hosting software and as such you don't want to lose your code w
 
 * `/home/git/data`
 
-Note that if you are using the `docker-compose` approach, this has already been done for you.
+*Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.*
 
 SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux.
 
@@ -462,7 +462,14 @@ Out of the four files generated above, we need to install the `gitlab.key`, `git
 
 The default path that the gitlab application is configured to look for the SSL certificates is at `/home/git/data/certs`, this can however be changed using the `SSL_KEY_PATH`, `SSL_CERTIFICATE_PATH` and `SSL_DHPARAM_PATH` configuration options.
 
-If you remember from above, the `/home/git/data` path is the path of the [data store](#data-store), which means that we have to create a folder named `certs/` inside `/srv/docker/gitlab/gitlab/` and copy the files into it and as a measure of security we'll update the permission on the `gitlab.key` file to only be readable by the owner.
+If you remember from above, the `/home/git/data` path is the path of the [data store](#data-store), which means that we have to create a folder named `certs/` inside the volume to where `/home/git/data` point and copy the files into it and as a measure of security we'll update the permission on the `gitlab.key` file to only be readable by the owner.
+
+In case use of docker-compose ...
+
+```$>docker volume inspect```
+
+look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint"
+
 
 ```bash
 mkdir -p /srv/docker/gitlab/gitlab/certs

From 8fd3598b88766aa6d6d1fb0c74e3526a55eec784 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 30 Jul 2021 16:38:16 +0200
Subject: [PATCH 0653/1124] upgrade GitLab CE to 14.1.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4bbb28e2a..51e838dda 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.1.1**
+- gitlab: upgrade CE to v14.1.1
+- gitaly: upgrade to v14.1.1
+- ubuntu: upgrade to focal-20210723
+
 **14.1.0**
 - gitlab: upgrade CE to v14.1.0
 - gitaly: upgrade to v14.1.0
diff --git a/Dockerfile b/Dockerfile
index 547861a8b..b83efd78a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:focal-20210609
+FROM ubuntu:focal-20210723
 
-ARG VERSION=14.1.0
+ARG VERSION=14.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.6 \
     GITLAB_SHELL_VERSION=13.19.0 \
     GITLAB_PAGES_VERSION=1.41.0 \
-    GITALY_SERVER_VERSION=14.1.0 \
+    GITALY_SERVER_VERSION=14.1.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a95ff93ba..2477adcb9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.1.0
+# sameersbn/gitlab:14.1.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.0
+docker pull sameersbn/gitlab:14.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.1.0
+ sameersbn/gitlab:14.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.1.0
+    sameersbn/gitlab:14.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:sanitize
+    sameersbn/gitlab:14.1.1 app:sanitize
 ```
 
 ### Piwik
@@ -1179,7 +1179,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1214,14 +1214,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake db:setup
+    sameersbn/gitlab:14.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1230,7 +1230,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1280,7 +1280,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1348,12 +1348,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.0
+docker pull sameersbn/gitlab:14.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1379,7 +1379,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.1
 ```
 
 ## Shell Access
@@ -1417,7 +1417,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7b3b6e02b..26f2bbc19 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.0
+14.1.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9e3c24be5..c90e9b498 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b3e815e50..ff0e1e36f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 415208015..98abec56b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3a8ad568c..71f3af74c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.0
+docker pull sameersbn/gitlab:14.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.1.0
+sameersbn/gitlab:14.1.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4a2281d38..dd656df50 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 32093a8a5..b38a373af 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.0
+    image: sameersbn/gitlab:14.1.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3fbfeb88f..278609cc7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.1.0
+        image: sameersbn/gitlab:14.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From bed4200b02790cbe1c8d1fefc93ea1a076945115 Mon Sep 17 00:00:00 2001
From: Akanoa <dev@guern.eu>
Date: Sat, 3 Jul 2021 14:32:17 +0000
Subject: [PATCH 0654/1124] feat: allow to configure the packages registry from
 environment variables

---
 README.md                                 | 43 ++++++++++++-----
 assets/runtime/config/gitlabhq/gitlab.yml | 40 +++++++++-------
 assets/runtime/env-defaults               | 56 ++++++++++++++++++-----
 assets/runtime/functions                  | 45 ++++++++++++++++++
 4 files changed, 144 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index a95ff93ba..a17a19cd2 100644
--- a/README.md
+++ b/README.md
@@ -835,6 +835,10 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
 | `AWS_ACCESS_KEY_ID`| Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`|
 | `AWS_SECRET_ACCESS_KEY`| Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`|
+| `AWS_REGION`| AWS Region. Defaults to `us-east-1` |
+| `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`|
+| `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`|
+| `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Default Google project to use for Object Store.|
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Default Google service account email to use for Object Store.|
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file Defaults to `/gcs/key.json`|
@@ -847,10 +851,10 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
@@ -864,13 +868,28 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
+| `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` |
+| `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` |
+| `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false` |
+| `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
+| `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
+| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
 | `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. |
 | `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` |
 | `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` | Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` |
@@ -880,10 +899,10 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
+| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 18d3b980e..b8ddc6210 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -320,25 +320,33 @@ production: &base
 
   ## Packages (maven repository, npm registry, etc...)
   packages:
-    enabled: true
+    enabled: {{GITLAB_PACKAGES_ENABLED}}
     # The location where build packages are stored (default: shared/packages).
-    # storage_path: shared/packages
+    path: {{GITLAB_PACKAGES_DIR}}
     object_store:
-      enabled: false
-      remote_directory: packages # The bucket name
-      # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
-      # background_upload: false # Temporary option to limit automatic upload (Default: true)
-      # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
+      enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}}
+      remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
+      direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
+      background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
+      proxy_download: {{GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
-        provider: AWS
-        aws_access_key_id: AWS_ACCESS_KEY_ID
-        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-        region: us-east-1
-        # host: 'localhost' # default: s3.amazonaws.com
-        # endpoint: 'http://127.0.0.1:9000' # default: nil
-        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
-        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-
+        provider: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment
+        #start-packages-aws
+        aws_access_key_id: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
+        aws_secret_access_key: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
+        region: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION}}
+        host: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
+        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        endpoint: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
+        path_style: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+        #end-packages-aws
+        #start-packages-gcs
+        google_project: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        #end-packages-gcs
+
+  
   ## Dependency Proxy
   dependency_proxy:
     enabled: true
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index ad1ebc18f..32a4a4327 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -103,8 +103,16 @@ GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s}
 
 # OBJECTSTORE
 GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDER:-AWS}
+
+#-- AWS
 AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
 AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
+AWS_HOST=${AWS_REGION:-us-east-1}
+AWS_HOST=${AWS_HOST:-s3.amazonaws.com}
+AWS_ENDPOINT=${AWS_ENDPOINT:nil}
+AWS_ENDPOINT=${AWS_PATH_STYLE:true}
+
+#-- Google
 GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
 GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
 GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-"/gcs/key.json"}
@@ -124,16 +132,40 @@ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STOR
 # ARTIFACTS:AWS
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
-GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
 
 # ARTIFACTS:Google
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
 
+## PACKAGES
+GITLAB_PACKAGES_ENABLED=${GITLAB_PACKAGES_ENABLED:-true}
+GITLAB_PACKAGES_DIR="${GITLAB_PACKAGES_DIR:-$GITLAB_SHARED_DIR/packages}"
+
+
+GITLAB_PACKAGES_OBJECT_STORE_ENABLED=${GITLAB_PACKAGES_OBJECT_STORE_ENABLED:-false}
+GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-packages}
+GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD:-false}
+GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD:-false}
+GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD:-false}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
+
+# PACKAGES:AWS
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+
+# PACKAGES:Google
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
 
 ## Cron Jobs
 GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"}
@@ -152,10 +184,10 @@ GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION
 # LFS:AWS
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
-GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
 
 # LFS:Google
 GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
@@ -176,10 +208,10 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CO
 # Uploads:AWS
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil}
-GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
 
 # Uploads:Google
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index cd5f501ff..dba058d2a 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1010,6 +1010,50 @@ gitlab_configure_artifacts() {
     GITLAB_ARTIFACTS_DIR
 }
 
+
+gitlab_configure_packages() {
+  if [[ ${GITLAB_PACKAGES_OBJECT_STORE_ENABLED} == true ]]; then
+    echo "Configuring gitlab::packages:object_store"
+
+    if [[ "${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then
+        echo " -> Google PACKAGES provider selected removing aws config"
+        exec_as_git sed -i "/#start-packages-aws/,/#end-packages-aws/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#start-packages-gcs/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#end-packages-gcs/d" ${GITLAB_CONFIG}
+    fi
+    if [[ "${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then
+      echo " -> AWS PACKAGES provider selected removing Google config"
+      exec_as_git sed -i "/#start-packages-gcs/,/#end-packages-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-packages-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-packages-aws/d" ${GITLAB_CONFIG}
+    fi
+
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_PACKAGES_OBJECT_STORE_ENABLED \
+      GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD \
+      GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD \
+      GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
+  else
+    exec_as_git sed -i -e "/path: {{GITLAB_PACKAGES_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
+  fi
+
+  echo "Configuring gitlab::packages..."
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_PACKAGES_ENABLED \
+    GITLAB_PACKAGES_DIR
+}
+
 gitlab_configure_lfs() {
   if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::lfs:object_store"
@@ -1709,6 +1753,7 @@ configure_gitlab() {
   gitlab_configure_rack_attack
   gitlab_configure_ci
   gitlab_configure_artifacts
+  gitlab_configure_packages
   gitlab_configure_lfs
   gitlab_configure_uploads
   gitlab_configure_mattermost

From a59cf8c65ce61a940ea3bd8b1c7ed06835c11b1e Mon Sep 17 00:00:00 2001
From: Akanoa <dev@guern.eu>
Date: Sat, 3 Jul 2021 15:24:58 +0000
Subject: [PATCH 0655/1124] fix: add missing ENV about packages registry

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a17a19cd2..99c5ceccb 100644
--- a/README.md
+++ b/README.md
@@ -875,6 +875,8 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
+| `GITLAB_PACKAGES_ENABLED` | Enable/Disable Pakages support. Defaults to `true`. |
+| `GITLAB_PACKAGES_DIR` | Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` |
 | `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` |
 | `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` |
 | `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false` |

From cfa1fe2e28f98d936eeffe8d9416e5cdd439398a Mon Sep 17 00:00:00 2001
From: Akanoa <dev@guern.eu>
Date: Sat, 3 Jul 2021 17:45:56 +0000
Subject: [PATCH 0656/1124] fix: bad default value

---
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index b8ddc6210..236c27b7a 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -326,7 +326,7 @@ production: &base
     object_store:
       enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}}
       remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
-      direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage.
+      direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Packages without the need of local shared storage.
       background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true)
       proxy_download: {{GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
       connection:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 32a4a4327..3674ad175 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -107,10 +107,10 @@ GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDE
 #-- AWS
 AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID}
 AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY}
-AWS_HOST=${AWS_REGION:-us-east-1}
+AWS_REGION=${AWS_REGION:-us-east-1}
 AWS_HOST=${AWS_HOST:-s3.amazonaws.com}
-AWS_ENDPOINT=${AWS_ENDPOINT:nil}
-AWS_ENDPOINT=${AWS_PATH_STYLE:true}
+AWS_ENDPOINT=${AWS_ENDPOINT:-nil}
+AWS_PATH_STYLE=${AWS_PATH_STYLE:-true}
 
 #-- Google
 GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}

From e2354ed8aa8e60a4a35a16e4b9e5df10b571c0f8 Mon Sep 17 00:00:00 2001
From: Akanoa <dev@guern.eu>
Date: Fri, 30 Jul 2021 22:41:31 +0000
Subject: [PATCH 0657/1124] feat: Add "AWS_SIGNATURE_VERSION" related
 environment variables

---
 README.md                                 | 4 ++++
 assets/runtime/config/gitlabhq/gitlab.yml | 7 ++++---
 assets/runtime/env-defaults               | 5 +++++
 assets/runtime/functions                  | 4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 99c5ceccb..8bc7497fd 100644
--- a/README.md
+++ b/README.md
@@ -839,6 +839,7 @@ Below is the complete list of available options that can be used to customize yo
 | `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`|
 | `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`|
 | `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
+| `AWS_SIGNATURE_VERSION`| AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` |
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Default Google project to use for Object Store.|
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Default Google service account email to use for Object Store.|
 | `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file Defaults to `/gcs/key.json`|
@@ -855,6 +856,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE` |
+| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
@@ -872,6 +874,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
@@ -905,6 +908,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
+| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
 | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 236c27b7a..c5dd61269 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -229,7 +229,7 @@ production: &base
         aws_secret_access_key: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
-        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        aws_signature_version: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4.
         endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
         path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
         #end-artifacts-aws
@@ -273,6 +273,7 @@ production: &base
         #start-lfs-aws
         aws_access_key_id: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
+        aws_signature_version: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4.
         region: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
@@ -306,7 +307,7 @@ production: &base
         #start-uploads-aws
         aws_access_key_id: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
         aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
-        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        aws_signature_version: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4.
         region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
         endpoint: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
@@ -336,7 +337,7 @@ production: &base
         aws_secret_access_key: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
         region: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION}}
         host: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
-        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+        aws_signature_version: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4.
         endpoint: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
         path_style: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
         #end-packages-aws
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 3674ad175..7dac47c09 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -111,6 +111,7 @@ AWS_REGION=${AWS_REGION:-us-east-1}
 AWS_HOST=${AWS_HOST:-s3.amazonaws.com}
 AWS_ENDPOINT=${AWS_ENDPOINT:-nil}
 AWS_PATH_STYLE=${AWS_PATH_STYLE:-true}
+AWS_SIGNATURE_VERSION=${AWS_SIGNATURE_VERSION:-4}
 
 #-- Google
 GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
@@ -136,6 +137,7 @@ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_ST
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION}
 
 # ARTIFACTS:Google
 GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
@@ -161,6 +163,7 @@ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_PACKAGES_OBJECT_STOR
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION}
 
 # PACKAGES:Google
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
@@ -188,6 +191,7 @@ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTI
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
 GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION}
 
 # LFS:Google
 GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
@@ -212,6 +216,7 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION}
 
 # Uploads:Google
 GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index dba058d2a..4655af157 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -997,6 +997,7 @@ gitlab_configure_artifacts() {
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
@@ -1041,6 +1042,7 @@ gitlab_configure_packages() {
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
       GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
@@ -1084,6 +1086,7 @@ gitlab_configure_lfs() {
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
       GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
@@ -1127,6 +1130,7 @@ gitlab_configure_uploads() {
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
       GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION

From f32348120679fdb13232bcb38f4e19172d488b32 Mon Sep 17 00:00:00 2001
From: Jonathan Kline <jonathan.kline@starlab.io>
Date: Mon, 2 Aug 2021 16:39:10 -0500
Subject: [PATCH 0658/1124] Corrected a typo in the artifacts section to allow
 proper updating and replacement of the AWS_SIGNING_VERSION for artifacts

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4655af157..c691ffe58 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -997,7 +997,7 @@ gitlab_configure_artifacts() {
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
-      GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
+      GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
       GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION

From d17a838e32fe6588abb49ea7b1253338ef0ab6a7 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 4 Aug 2021 16:46:17 +0200
Subject: [PATCH 0659/1124] upgrade GitLab CE to 14.1.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 51e838dda..cf913fa74 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.1.2**
+- gitlab: upgrade CE to v14.1.2
+- gitaly: upgrade to v14.1.2
+- gitlab-shell: upgrade to v13.19.1
+
 **14.1.1**
 - gitlab: upgrade CE to v14.1.1
 - gitaly: upgrade to v14.1.1
diff --git a/Dockerfile b/Dockerfile
index b83efd78a..327f008c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.1.1
+ARG VERSION=14.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.16.6 \
-    GITLAB_SHELL_VERSION=13.19.0 \
+    GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.41.0 \
-    GITALY_SERVER_VERSION=14.1.1 \
+    GITALY_SERVER_VERSION=14.1.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3cda1b29c..3345b8fd5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.1.1
+# sameersbn/gitlab:14.1.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.1
+docker pull sameersbn/gitlab:14.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.1.1
+ sameersbn/gitlab:14.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.1.1
+    sameersbn/gitlab:14.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:sanitize
+    sameersbn/gitlab:14.1.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake db:setup
+    sameersbn/gitlab:14.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.1
+docker pull sameersbn/gitlab:14.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 26f2bbc19..900dba2dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.1
+14.1.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c90e9b498..52f1e5117 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ff0e1e36f..d9ad5a1b2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 98abec56b..406e62868 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 71f3af74c..64d290946 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.1
+docker pull sameersbn/gitlab:14.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.1.1
+sameersbn/gitlab:14.1.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index dd656df50..46fc88236 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b38a373af..34f9caafe 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.1
+    image: sameersbn/gitlab:14.1.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 278609cc7..156c427c2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.1.1
+        image: sameersbn/gitlab:14.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From edb13cf1b8066a05c37ed6607f352d0653b085df Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 21 Aug 2021 09:32:03 +0200
Subject: [PATCH 0660/1124] upgrade GitLab CE to 14.1.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cf913fa74..0e33dd66e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.1.3**
+- gitlab: upgrade CE to v14.1.3
+- gitaly: upgrade to v14.1.3
+- golang: upgrade to v1.16.7
+
 **14.1.2**
 - gitlab: upgrade CE to v14.1.2
 - gitaly: upgrade to v14.1.2
diff --git a/Dockerfile b/Dockerfile
index 327f008c5..6633c6d2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.1.2
+ARG VERSION=14.1.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.6 \
+    GOLANG_VERSION=1.16.7 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.41.0 \
-    GITALY_SERVER_VERSION=14.1.2 \
+    GITALY_SERVER_VERSION=14.1.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3345b8fd5..f602655ec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.1.2
+# sameersbn/gitlab:14.1.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.2
+docker pull sameersbn/gitlab:14.1.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.1.2
+ sameersbn/gitlab:14.1.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.1.2
+    sameersbn/gitlab:14.1.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:sanitize
+    sameersbn/gitlab:14.1.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake db:setup
+    sameersbn/gitlab:14.1.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.1.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.2
+docker pull sameersbn/gitlab:14.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 900dba2dd..e84178ff7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.2
+14.1.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 52f1e5117..cacb7f5c2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d9ad5a1b2..9c1156bcd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 406e62868..5b5d5f72d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 64d290946..5fa3b6f51 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.2
+docker pull sameersbn/gitlab:14.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.1.2
+sameersbn/gitlab:14.1.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 46fc88236..df526e76f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 34f9caafe..fcf78c54c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.2
+    image: sameersbn/gitlab:14.1.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 156c427c2..8d4ad70ff 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.1.2
+        image: sameersbn/gitlab:14.1.3
         env:
         - name: TZ
           value: Asia/Kolkata

From adc74554af48cdddbb899df0d2f0313f54e82956 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 22 Aug 2021 21:15:28 +0200
Subject: [PATCH 0661/1124] upgrade GitLab CE to 14.2.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0e33dd66e..947343dab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.2.0**
+- gitlab: upgrade CE to v14.2.0
+- gitaly: upgrade to v14.2.0
+- gitlab-pages: upgrade to v1.42.0
+- golang: upgrade to v1.17
+
 **14.1.3**
 - gitlab: upgrade CE to v14.1.3
 - gitaly: upgrade to v14.1.3
diff --git a/Dockerfile b/Dockerfile
index 6633c6d2c..4acc4f7d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.1.3
+ARG VERSION=14.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.7 \
+    GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
-    GITLAB_PAGES_VERSION=1.41.0 \
-    GITALY_SERVER_VERSION=14.1.3 \
+    GITLAB_PAGES_VERSION=1.42.0 \
+    GITALY_SERVER_VERSION=14.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f602655ec..abcf7bc64 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.1.3
+# sameersbn/gitlab:14.2.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.1.3
+ sameersbn/gitlab:14.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:sanitize
+    sameersbn/gitlab:14.2.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake db:setup
+    sameersbn/gitlab:14.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e84178ff7..07ea9fa43 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.3
+14.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cacb7f5c2..a8706fa92 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9c1156bcd..45b41b549 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b5d5f72d..e7969e8d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5fa3b6f51..f043b1d0e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.1.3
+sameersbn/gitlab:14.2.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index df526e76f..32a63bd69 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fcf78c54c..665573b2f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8d4ad70ff..dcfa0e36c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.1.3
+        image: sameersbn/gitlab:14.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 93a47b7d75d984c612475ffcdc636d84e632d468 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 24 Aug 2021 20:55:08 +0200
Subject: [PATCH 0662/1124] Update patch
 '0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch'

---
 ...eature-checking-for-gitaly-on-a-fresh-install.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
index 86c366105..2b80cde1d 100644
--- a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
+++ b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
@@ -1,19 +1,19 @@
 diff --git a/lib/feature.rb b/lib/feature.rb
-index 7cf40b63fdf..f225a666cfc 100644
+index f8d34e9c386..549c7fc063e 100644
 --- a/lib/feature.rb
 +++ b/lib/feature.rb
-@@ -33,6 +33,7 @@ class Feature
+@@ -37,6 +37,7 @@ def get(key)
  
      def persisted_names
-       return [] unless Gitlab::Database.exists?
+       return [] unless Gitlab::Database.main.exists?
 +      return [] unless Feature::FlipperFeature.table_exists?
  
        # This loads names of all stored feature flags
        # and returns a stable Set in the following order:
-@@ -67,6 +68,7 @@ class Feature
+@@ -74,6 +75,7 @@ def enabled?(key, thing = nil, type: :development, default_enabled: false)
        # During setup the database does not exist yet. So we haven't stored a value
        # for the feature yet and return the default.
-       return default_enabled unless Gitlab::Database.exists?
+       return default_enabled unless Gitlab::Database.main.exists?
 +      return default_enabled unless Feature::FlipperFeature.table_exists?
  
        feature = get(key)

From 6cfafa60bc6bf47860d8e217bbd55e934afdeafe Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Aug 2021 06:09:32 +0200
Subject: [PATCH 0663/1124] upgrade GitLab CE to 14.2.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 947343dab..415e9d181 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.2.0**
+- gitlab: upgrade CE to v14.2.1
+- gitaly: upgrade to v14.2.1
+
 **14.2.0**
 - gitlab: upgrade CE to v14.2.0
 - gitaly: upgrade to v14.2.0
diff --git a/Dockerfile b/Dockerfile
index 4acc4f7d6..7524ddc32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.2.0
+ARG VERSION=14.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.0 \
+    GITALY_SERVER_VERSION=14.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index abcf7bc64..8704540fa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.0
+# sameersbn/gitlab:14.2.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.0
+ sameersbn/gitlab:14.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:sanitize
+    sameersbn/gitlab:14.2.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake db:setup
+    sameersbn/gitlab:14.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 07ea9fa43..dab6a80f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.0
+14.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a8706fa92..abf12237b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 45b41b549..2f41597a9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e7969e8d8..7f7daa7bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f043b1d0e..96a30891b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.0
+sameersbn/gitlab:14.2.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 32a63bd69..4c90d2c80 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 665573b2f..06ed540cb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dcfa0e36c..2dc6632d6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.0
+        image: sameersbn/gitlab:14.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From b63a36883276140e06708e53c622a771671f654e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 1 Sep 2021 08:31:39 +0200
Subject: [PATCH 0664/1124] upgrade GitLab CE to 14.2.2

---
 Changelog.md                            |  7 +++-
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 415e9d181..62870f1d0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**14.2.0**
+**14.2.2**
+- gitlab: upgrade CE to v14.2.2
+- gitaly: upgrade to v14.2.2
+- ubuntu: upgrade to focal-20210827
+
+**14.2.1**
 - gitlab: upgrade CE to v14.2.1
 - gitaly: upgrade to v14.2.1
 
diff --git a/Dockerfile b/Dockerfile
index 7524ddc32..2178de715 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:focal-20210723
+FROM ubuntu:focal-20210827
 
-ARG VERSION=14.2.1
+ARG VERSION=14.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.1 \
+    GITALY_SERVER_VERSION=14.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8704540fa..dedd8e8f7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.1
+# sameersbn/gitlab:14.2.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.1
+docker pull sameersbn/gitlab:14.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.1
+ sameersbn/gitlab:14.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.1
+    sameersbn/gitlab:14.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:sanitize
+    sameersbn/gitlab:14.2.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake db:setup
+    sameersbn/gitlab:14.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.1
+docker pull sameersbn/gitlab:14.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index dab6a80f4..e4eccd4e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.1
+14.2.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index abf12237b..4a9bd6270 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2f41597a9..85b2d0b62 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7f7daa7bb..d0a48f610 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 96a30891b..9ecd4031f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.1
+docker pull sameersbn/gitlab:14.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.1
+sameersbn/gitlab:14.2.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4c90d2c80..6889e1fef 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 06ed540cb..be2757cc3 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.1
+    image: sameersbn/gitlab:14.2.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2dc6632d6..8110c391c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.1
+        image: sameersbn/gitlab:14.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 63f42c6329400fe4eac3424eb3d220881db7e2ee Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 6 Sep 2021 20:25:40 +0200
Subject: [PATCH 0665/1124] upgrade GitLab CE to 14.2.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 62870f1d0..c4618cd17 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.2.2**
+- gitlab: upgrade CE to v14.2.3
+- gitaly: upgrade to v14.2.3
+
 **14.2.2**
 - gitlab: upgrade CE to v14.2.2
 - gitaly: upgrade to v14.2.2
diff --git a/Dockerfile b/Dockerfile
index 2178de715..d1e4b4ad0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210827
 
-ARG VERSION=14.2.2
+ARG VERSION=14.2.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.2 \
+    GITALY_SERVER_VERSION=14.2.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index dedd8e8f7..2b6e0fa34 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.2
+# sameersbn/gitlab:14.2.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.2
+docker pull sameersbn/gitlab:14.2.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.2
+ sameersbn/gitlab:14.2.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.2
+    sameersbn/gitlab:14.2.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:sanitize
+    sameersbn/gitlab:14.2.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake db:setup
+    sameersbn/gitlab:14.2.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.2
+docker pull sameersbn/gitlab:14.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e4eccd4e6..0c2380a58 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.2
+14.2.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4a9bd6270..cecab6680 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 85b2d0b62..a9caecd7d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d0a48f610..2ab3bdfb8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9ecd4031f..b3457b31e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.2
+docker pull sameersbn/gitlab:14.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.2
+sameersbn/gitlab:14.2.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6889e1fef..3132dd146 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index be2757cc3..4d4737960 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.2
+    image: sameersbn/gitlab:14.2.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8110c391c..11be12160 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.2
+        image: sameersbn/gitlab:14.2.3
         env:
         - name: TZ
           value: Asia/Kolkata

From e87e745d840659b1b749696bc7b4c5ad6fa77f8c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 7 Sep 2021 17:26:02 +0200
Subject: [PATCH 0666/1124] Update Changelog.md

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index c4618cd17..ec6778a55 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,7 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**14.2.2**
+**14.2.3**
 - gitlab: upgrade CE to v14.2.3
 - gitaly: upgrade to v14.2.3
 

From 5450cc4b7aedd39ac0ba34485fcc82497932a4b1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Sep 2021 07:08:56 +0200
Subject: [PATCH 0667/1124] upgrade GitLab CE to 14.2.4

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ec6778a55..2e413df60 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.2.4**
+- gitlab: upgrade CE to v14.2.4
+- gitaly: upgrade to v14.2.4
+- golang: upgrade to v1.17.1
+
 **14.2.3**
 - gitlab: upgrade CE to v14.2.3
 - gitaly: upgrade to v14.2.3
diff --git a/Dockerfile b/Dockerfile
index d1e4b4ad0..f6772d5fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210827
 
-ARG VERSION=14.2.3
+ARG VERSION=14.2.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.17 \
+    GOLANG_VERSION=1.17.1 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.3 \
+    GITALY_SERVER_VERSION=14.2.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2b6e0fa34..b7003d22d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.3
+# sameersbn/gitlab:14.2.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.3
+docker pull sameersbn/gitlab:14.2.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.3
+ sameersbn/gitlab:14.2.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.3
+    sameersbn/gitlab:14.2.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:sanitize
+    sameersbn/gitlab:14.2.4 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake db:setup
+    sameersbn/gitlab:14.2.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.3
+docker pull sameersbn/gitlab:14.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.4
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0c2380a58..0d51f0564 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.3
+14.2.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cecab6680..f94fafe35 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a9caecd7d..93895950d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ab3bdfb8..942dced8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b3457b31e..26c89d90f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.3
+docker pull sameersbn/gitlab:14.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.3
+sameersbn/gitlab:14.2.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3132dd146..f1ce83c56 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4d4737960..d4bbc45d3 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.3
+    image: sameersbn/gitlab:14.2.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 11be12160..278ebaad8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.3
+        image: sameersbn/gitlab:14.2.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 6fd5c2d2d3dfac52578092a963882d827b1f93fe Mon Sep 17 00:00:00 2001
From: Alessio <alessio.vertemati@gmail.com>
Date: Mon, 4 Oct 2021 14:21:38 +0200
Subject: [PATCH 0668/1124] Update Gitlab to 14.2.5

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2e413df60..1b622584c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.2.5**
+- gitlab: upgrade CE to v14.2.5
+- gitaly: upgrade to v14.2.5
+- gitlab-pages: upgrade to v1.45.0
+
 **14.2.4**
 - gitlab: upgrade CE to v14.2.4
 - gitaly: upgrade to v14.2.4
diff --git a/Dockerfile b/Dockerfile
index f6772d5fb..e1b12e058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210827
 
-ARG VERSION=14.2.4
+ARG VERSION=14.2.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17.1 \
     GITLAB_SHELL_VERSION=13.19.1 \
-    GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.4 \
+    GITLAB_PAGES_VERSION=1.45.0 \
+    GITALY_SERVER_VERSION=14.2.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b7003d22d..19bceb27f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.4
+# sameersbn/gitlab:14.2.5
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.4
+docker pull sameersbn/gitlab:14.2.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.4
+ sameersbn/gitlab:14.2.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.4
+    sameersbn/gitlab:14.2.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:sanitize
+    sameersbn/gitlab:14.2.5 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake db:setup
+    sameersbn/gitlab:14.2.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.2.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.4
+docker pull sameersbn/gitlab:14.2.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.5
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0d51f0564..56fe42e45 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.4
+14.2.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f94fafe35..ff46b1491 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 93895950d..a1e4dcdee 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 942dced8d..13623bec6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 26c89d90f..268cbb120 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.4
+docker pull sameersbn/gitlab:14.2.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.4
+sameersbn/gitlab:14.2.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f1ce83c56..67791743f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d4bbc45d3..2e3091748 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.4
+    image: sameersbn/gitlab:14.2.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 278ebaad8..476678966 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.4
+        image: sameersbn/gitlab:14.2.5
         env:
         - name: TZ
           value: Asia/Kolkata

From b98e6904de645c06e9fd5337fd07e34689180c87 Mon Sep 17 00:00:00 2001
From: Alessio <alessio.vertemati@gmail.com>
Date: Tue, 5 Oct 2021 19:18:00 +0200
Subject: [PATCH 0669/1124] Revert change to gitlab pages version

---
 Changelog.md | 1 -
 Dockerfile   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1b622584c..ed39caff1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,6 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list
 **14.2.5**
 - gitlab: upgrade CE to v14.2.5
 - gitaly: upgrade to v14.2.5
-- gitlab-pages: upgrade to v1.45.0
 
 **14.2.4**
 - gitlab: upgrade CE to v14.2.4
diff --git a/Dockerfile b/Dockerfile
index e1b12e058..607a156e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17.1 \
     GITLAB_SHELL_VERSION=13.19.1 \
-    GITLAB_PAGES_VERSION=1.45.0 \
+    GITLAB_PAGES_VERSION=1.42.0 \
     GITALY_SERVER_VERSION=14.2.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 173e5e25a38c7d229ea1f66240d058124b6687d4 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 15 Sep 2021 14:20:39 +0900
Subject: [PATCH 0670/1124] Install ruby from source (v2.4.2)

---
 Dockerfile              |  8 +++-----
 assets/build/install.sh | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 607a156e3..914fc08d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@ FROM ubuntu:focal-20210827
 ARG VERSION=14.2.5
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7 \
+    RUBY_VERSION=2.7.2 \
+    RUBY_SOURCE_SHA256SUM="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" \
     GOLANG_VERSION=1.17.1 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
@@ -31,8 +32,6 @@ RUN apt-get update \
 RUN set -ex && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
  && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal main" >> /etc/apt/sources.list \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \
- && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu focal main" >> /etc/apt/sources.list \
  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \
  && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
@@ -46,7 +45,7 @@ RUN set -ex && \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \
-      git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
+      git-core python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
       libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
@@ -54,7 +53,6 @@ RUN set -ex && \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
- && gem install --no-document bundler -v 2.1.4 \
  && rm -rf /var/lib/apt/lists/*
 
 COPY assets/build/ ${GITLAB_BUILD_DIR}/
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 32cfd21fe..4d1526524 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -18,7 +18,7 @@ PATH=${GOROOT}/bin:$PATH
 export GOROOT PATH
 
 BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
-  libc6-dev ruby${RUBY_VERSION}-dev \
+  libc6-dev \
   libpq-dev zlib1g-dev libyaml-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
@@ -37,11 +37,25 @@ exec_as_git() {
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUILD_DEPENDENCIES}
 
+# build ruby from source
+echo "Building ruby v${RUBY_VERSION} from source..."
+PWD_ORG="$PWD"
+mkdir /tmp/ruby && cd /tmp/ruby
+curl --remote-name -Ss "https://cache.ruby-lang.org/pub/ruby/${RUBY_VERSION%.*}/ruby-${RUBY_VERSION}.tar.gz"
+printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c -
+tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}"
+./configure --disable-install-rdoc --enable-shared
+make -j"$(nproc)"
+make install
+cd "$PWD_ORG" && rm -rf /tmp/ruby
+
+gem install bundler -N -v 2.1.4
+
 # PaX-mark ruby
 # Applying the mark late here does make the build usable on PaX kernels, but
 # still the build itself must be executed on a non-PaX kernel. It's done here
 # only for simplicity.
-paxctl -cvm "$(command -v ruby${RUBY_VERSION})"
+paxctl -cvm "$(command -v ruby)"
 # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
 paxctl -cvm "$(command -v node)"
 

From 729a00a3c9b7290dd422c9f3f9556c94a85dae4b Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 6 Aug 2021 11:11:48 +0900
Subject: [PATCH 0671/1124] remove runtime/config/gitlabhq/rack_attack.rb

---
 assets/runtime/config/gitlabhq/rack_attack.rb | 29 -------------------
 assets/runtime/functions                      |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 assets/runtime/config/gitlabhq/rack_attack.rb

diff --git a/assets/runtime/config/gitlabhq/rack_attack.rb b/assets/runtime/config/gitlabhq/rack_attack.rb
deleted file mode 100644
index 69052c029..000000000
--- a/assets/runtime/config/gitlabhq/rack_attack.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# 1. Rename this file to rack_attack.rb
-# 2. Review the paths_to_be_protected and add any other path you need protecting
-#
-# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
-
-paths_to_be_protected = [
-  "#{Rails.application.config.relative_url_root}/users/password",
-  "#{Rails.application.config.relative_url_root}/users/sign_in",
-  "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json",
-  "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session",
-  "#{Rails.application.config.relative_url_root}/users",
-  "#{Rails.application.config.relative_url_root}/users/confirmation",
-  "#{Rails.application.config.relative_url_root}/unsubscribes/",
-  "#{Rails.application.config.relative_url_root}/import/github/personal_access_token"
-
-]
-
-# Create one big regular expression that matches strings starting with any of
-# the paths_to_be_protected.
-paths_regex = Regexp.union(paths_to_be_protected.map { |path| /\A#{Regexp.escape(path)}/ })
-rack_attack_enabled = Gitlab.config.rack_attack.git_basic_auth['enabled']
-
-unless Rails.env.test? || !rack_attack_enabled
-  Rack::Attack.throttle('protected paths', limit: 10, period: 60.seconds) do |req|
-    if req.post? && req.path =~ paths_regex
-      req.ip
-    end
-  end
-end
diff --git a/assets/runtime/functions b/assets/runtime/functions
index c691ffe58..7dfe5d3e8 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -17,7 +17,6 @@ GITLAB_CONFIG="${GITLAB_INSTALL_DIR}/config/gitlab.yml"
 GITLAB_DATABASE_CONFIG="${GITLAB_INSTALL_DIR}/config/database.yml"
 GITLAB_PUMA_CONFIG="${GITLAB_INSTALL_DIR}/config/puma.rb"
 GITLAB_RELATIVE_URL_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/relative_url.rb"
-GITLAB_RACK_ATTACK_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/rack_attack.rb"
 GITLAB_SMTP_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/smtp_settings.rb"
 GITLAB_RESQUE_CONFIG="${GITLAB_INSTALL_DIR}/config/resque.yml"
 GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml"
@@ -1647,7 +1646,6 @@ install_configuration_templates() {
   install_template ${GITLAB_USER}: gitlabhq/gitlab.yml ${GITLAB_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/database.yml ${GITLAB_DATABASE_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/puma.rb ${GITLAB_PUMA_CONFIG} 0644
-  install_template ${GITLAB_USER}: gitlabhq/rack_attack.rb ${GITLAB_RACK_ATTACK_CONFIG} 0644
   install_template ${GITLAB_USER}: gitlabhq/resque.yml ${GITLAB_RESQUE_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/secrets.yml ${GITLAB_SECRETS_CONFIG} 0600
   install_template ${GITLAB_USER}: gitlab-shell/config.yml ${GITLAB_SHELL_CONFIG} 0640

From f8f2190826bc45d108c3b2d536f5e1d5fcc2eae6 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 5 Oct 2021 22:01:58 +0900
Subject: [PATCH 0672/1124] supress build time warnings

- [git] set advice.detachHead=false
- [bundle] use `bundle config set --local` instead of
  - `--deployment`
  - `--with` / `--without`
  arguments for `bundle install`
---
 assets/build/install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 32cfd21fe..9afa2fbdf 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -62,6 +62,7 @@ exec_as_git git config --global core.autocrlf input
 exec_as_git git config --global gc.auto 0
 exec_as_git git config --global repack.writeBitmaps true
 exec_as_git git config --global receive.advertisePushOptions true
+exec_as_git git config --global advice.detachedHead false
 
 # shallow clone gitlab-foss
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
@@ -92,7 +93,9 @@ cd ${GITLAB_SHELL_INSTALL_DIR}
 exec_as_git cp -a config.yml.example config.yml
 
 echo "Compiling gitlab-shell golang executables..."
-exec_as_git bundle install -j"$(nproc)" --deployment --with development test
+exec_as_git bundle config set --local deployment 'true'
+exec_as_git bundle config set --local with 'development test'
+exec_as_git bundle install -j"$(nproc)"
 exec_as_git "PATH=$PATH" make verify setup
 
 # remove unused repositories directory created by gitlab-shell install
@@ -149,7 +152,9 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then
   chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache
 fi
 
-exec_as_git bundle install -j"$(nproc)" --deployment --without development test mysql aws
+exec_as_git bundle config set --local deployment 'true'
+exec_as_git bundle config set --local without 'development test mysql aws'
+exec_as_git bundle install -j"$(nproc)"
 
 # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user
 chown -R ${GITLAB_USER}: ${GITLAB_HOME}

From 47d17b6ffb601ad1fede759f3e5f3ffe75ac33d2 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 10 Oct 2021 23:51:57 +0900
Subject: [PATCH 0673/1124] remove duplicated installation of `bundler`

`bundler 2.1.4` is default gem of ruby >= 2.7.1 and installed during ruby installation
so we don't need to install it explicitly.
---
 assets/build/install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 4d1526524..5180f20fe 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -49,8 +49,6 @@ make -j"$(nproc)"
 make install
 cd "$PWD_ORG" && rm -rf /tmp/ruby
 
-gem install bundler -N -v 2.1.4
-
 # PaX-mark ruby
 # Applying the mark late here does make the build usable on PaX kernels, but
 # still the build itself must be executed on a non-PaX kernel. It's done here

From 67de4d269849446c0f3853f9e904926863b87c5a Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 15 Sep 2021 14:21:57 +0900
Subject: [PATCH 0674/1124] upgrade ruby to 2.7.4 (requirement of gitlab
 v14.3.x)

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 914fc08d1..f8404e3b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20210827
 ARG VERSION=14.2.5
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.2 \
-    RUBY_SOURCE_SHA256SUM="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" \
+    RUBY_VERSION=2.7.4 \
+    RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
     GOLANG_VERSION=1.17.1 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \

From c36fc173541cfe2c8c08884bf0802a52deb243af Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 19 Oct 2021 20:00:55 +0200
Subject: [PATCH 0675/1124] Add variable for the source url of ruby

I think that defining a variable for the source of the Ruby tarball makes sense.
---
 assets/build/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 5180f20fe..c5f5244f5 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -10,6 +10,8 @@ GITLAB_WORKHORSE_BUILD_DIR=${GITLAB_INSTALL_DIR}/workhorse
 GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages
 GITLAB_GITALY_BUILD_DIR=/tmp/gitaly
 
+RUBY_SRC_URL=https://cache.ruby-lang.org/pub/ruby/${RUBY_VERSION%.*}/ruby-${RUBY_VERSION}.tar.gz
+
 GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache"
 
 GOROOT=/tmp/go
@@ -41,7 +43,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL
 echo "Building ruby v${RUBY_VERSION} from source..."
 PWD_ORG="$PWD"
 mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name -Ss "https://cache.ruby-lang.org/pub/ruby/${RUBY_VERSION%.*}/ruby-${RUBY_VERSION}.tar.gz"
+curl --remote-name -Ss "${RUBY_SRC_URL}"
 printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c -
 tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}"
 ./configure --disable-install-rdoc --enable-shared

From 2a360ac874b3ffd2f814b0b07761acddd5d6a6da Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Sep 2021 21:06:35 +0200
Subject: [PATCH 0676/1124] upgrade GitLab CE to 14.3.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ed39caff1..1ab5cf5f2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
 https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.3.0**
+- gitlab: upgrade CE to v14.3.0
+- gitaly: upgrade to v14.3.0
+- gitlab-shell: v13.21.0
+- gitlab-pages: upgrade to v1.44.0
+
 **14.2.5**
 - gitlab: upgrade CE to v14.2.5
 - gitaly: upgrade to v14.2.5
diff --git a/Dockerfile b/Dockerfile
index f8404e3b7..2427fa4a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20210827
 
-ARG VERSION=14.2.5
+ARG VERSION=14.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
     RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
     GOLANG_VERSION=1.17.1 \
-    GITLAB_SHELL_VERSION=13.19.1 \
-    GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.5 \
+    GITLAB_SHELL_VERSION=13.21.0 \
+    GITLAB_PAGES_VERSION=1.44.0 \
+    GITALY_SERVER_VERSION=14.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 19bceb27f..b48ca76c6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.2.5
+# sameersbn/gitlab:14.3.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.5
+docker pull sameersbn/gitlab:14.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.2.5
+ sameersbn/gitlab:14.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.2.5
+    sameersbn/gitlab:14.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:sanitize
+    sameersbn/gitlab:14.3.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake db:setup
+    sameersbn/gitlab:14.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:env:info
+    sameersbn/gitlab:14.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.5
+docker pull sameersbn/gitlab:14.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 56fe42e45..32f02f10e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.5
+14.3.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ff46b1491..1f7ee20b4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a1e4dcdee..62460ccab 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 13623bec6..ac1499e41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 268cbb120..03e337721 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.5
+docker pull sameersbn/gitlab:14.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.2.5
+sameersbn/gitlab:14.3.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 67791743f..b0628aa04 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2e3091748..065818d5d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.5
+    image: sameersbn/gitlab:14.3.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 476678966..12648928f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.5
+        image: sameersbn/gitlab:14.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 3232a10fe4af5664b74220c15795731711133e6f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 19 Oct 2021 21:41:12 +0200
Subject: [PATCH 0677/1124] Update base image, fix problems compiling
 gitlab-shell and complete changelog

---
 Changelog.md            | 5 +++--
 Dockerfile              | 2 +-
 assets/build/install.sh | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1ab5cf5f2..e1d6e1ee8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,13 +1,14 @@
 # Changelog
 
-This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
-https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
 **14.3.0**
 - gitlab: upgrade CE to v14.3.0
 - gitaly: upgrade to v14.3.0
 - gitlab-shell: v13.21.0
 - gitlab-pages: upgrade to v1.44.0
+- ruby: compile ruby from source and use v2.7.4
+- ubuntu: upgrade to focal-20211006
 
 **14.2.5**
 - gitlab: upgrade CE to v14.2.5
diff --git a/Dockerfile b/Dockerfile
index 2427fa4a4..0b8d48636 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20211006
 
 ARG VERSION=14.3.0
 
diff --git a/assets/build/install.sh b/assets/build/install.sh
index d718f2099..406d7c85a 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -110,6 +110,7 @@ echo "Compiling gitlab-shell golang executables..."
 exec_as_git bundle config set --local deployment 'true'
 exec_as_git bundle config set --local with 'development test'
 exec_as_git bundle install -j"$(nproc)"
+exec_as_git "${GOROOT}"/bin/go mod vendor
 exec_as_git "PATH=$PATH" make verify setup
 
 # remove unused repositories directory created by gitlab-shell install

From 6c0888b669fbb8f661140c951d662f131a815ec3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 19 Oct 2021 22:18:11 +0200
Subject: [PATCH 0678/1124] Add make target for gitlab-shell

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 406d7c85a..e6850bf21 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -111,7 +111,7 @@ exec_as_git bundle config set --local deployment 'true'
 exec_as_git bundle config set --local with 'development test'
 exec_as_git bundle install -j"$(nproc)"
 exec_as_git "${GOROOT}"/bin/go mod vendor
-exec_as_git "PATH=$PATH" make verify setup
+exec_as_git "PATH=$PATH" make fmt verify setup
 
 # remove unused repositories directory created by gitlab-shell install
 rm -rf ${GITLAB_HOME}/repositories

From 7601cdf312fbb490fa3d36b68ee95c873f7ce1ad Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 19 Oct 2021 21:47:04 +0200
Subject: [PATCH 0679/1124] upgrade GitLab CE to 14.3.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e1d6e1ee8..af96e220e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.3.1**
+- gitlab: upgrade CE to v14.3.1
+- gitaly: upgrade to v14.3.1
+
 **14.3.0**
 - gitlab: upgrade CE to v14.3.0
 - gitaly: upgrade to v14.3.0
diff --git a/Dockerfile b/Dockerfile
index 0b8d48636..09481c767 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.3.0
+ARG VERSION=14.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
     RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
-    GOLANG_VERSION=1.17.1 \
+    GOLANG_VERSION=1.17.2 \
     GITLAB_SHELL_VERSION=13.21.0 \
     GITLAB_PAGES_VERSION=1.44.0 \
-    GITALY_SERVER_VERSION=14.3.0 \
+    GITALY_SERVER_VERSION=14.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b48ca76c6..dd6449d70 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.3.0
+# sameersbn/gitlab:14.3.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.0
+docker pull sameersbn/gitlab:14.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.3.0
+ sameersbn/gitlab:14.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.3.0
+    sameersbn/gitlab:14.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:sanitize
+    sameersbn/gitlab:14.3.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake db:setup
+    sameersbn/gitlab:14.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.0
+docker pull sameersbn/gitlab:14.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 32f02f10e..6dfe8b129 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.0
+14.3.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1f7ee20b4..e49db454e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 62460ccab..cb76edbb1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ac1499e41..6987f56fa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 03e337721..5c70238e2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.0
+docker pull sameersbn/gitlab:14.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.3.0
+sameersbn/gitlab:14.3.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b0628aa04..c2b42ff6f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 065818d5d..2991e8099 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.0
+    image: sameersbn/gitlab:14.3.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 12648928f..8ab0da8e9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.3.0
+        image: sameersbn/gitlab:14.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From d1bc9002e019c4a26547ee895172c8469463df98 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 21 Oct 2021 06:42:04 +0200
Subject: [PATCH 0680/1124] upgrade GitLab CE to 14.3.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index af96e220e..70fce9ff8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.3.1**
+- gitlab: upgrade CE to v14.3.2
+- gitaly: upgrade to v14.3.2
+- gitlab-shell: v13.21.1
+
 **14.3.1**
 - gitlab: upgrade CE to v14.3.1
 - gitaly: upgrade to v14.3.1
diff --git a/Dockerfile b/Dockerfile
index 09481c767..0e3af5e10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.3.1
+ARG VERSION=14.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
     RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
     GOLANG_VERSION=1.17.2 \
-    GITLAB_SHELL_VERSION=13.21.0 \
+    GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.44.0 \
-    GITALY_SERVER_VERSION=14.3.1 \
+    GITALY_SERVER_VERSION=14.3.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index dd6449d70..a815fd0dc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.3.1
+# sameersbn/gitlab:14.3.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.1
+docker pull sameersbn/gitlab:14.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.3.1
+ sameersbn/gitlab:14.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.3.1
+    sameersbn/gitlab:14.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:sanitize
+    sameersbn/gitlab:14.3.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake db:setup
+    sameersbn/gitlab:14.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.1
+docker pull sameersbn/gitlab:14.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6dfe8b129..f84a42182 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.1
+14.3.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e49db454e..463e21e21 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index cb76edbb1..b25ee58c7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6987f56fa..005a2cd3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5c70238e2..b8c52049e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.1
+docker pull sameersbn/gitlab:14.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.3.1
+sameersbn/gitlab:14.3.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c2b42ff6f..821e307d8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2991e8099..2aba3efce 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.1
+    image: sameersbn/gitlab:14.3.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8ab0da8e9..bfd0d67fd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.3.1
+        image: sameersbn/gitlab:14.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 1e6a99f4b6e794f54cd85cdbcfeb4e270fed941e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 21 Oct 2021 21:50:09 +0200
Subject: [PATCH 0681/1124] Fix incorrect version number

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 70fce9ff8..b0cd7b44e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,7 +2,7 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**14.3.1**
+**14.3.2**
 - gitlab: upgrade CE to v14.3.2
 - gitaly: upgrade to v14.3.2
 - gitlab-shell: v13.21.1

From e8ba847300b872b4e0bc76b56f8fe8e81849e212 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 21 Oct 2021 21:44:26 +0200
Subject: [PATCH 0682/1124] Upgrade GitLab CE to 14.3.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b0cd7b44e..6ccdeafd1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.3.3**
+- gitlab: upgrade CE to v14.3.3
+- gitaly: upgrade to v14.3.3
+
 **14.3.2**
 - gitlab: upgrade CE to v14.3.2
 - gitaly: upgrade to v14.3.2
diff --git a/Dockerfile b/Dockerfile
index 0e3af5e10..8479d7bf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.3.2
+ARG VERSION=14.3.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.2 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.44.0 \
-    GITALY_SERVER_VERSION=14.3.2 \
+    GITALY_SERVER_VERSION=14.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a815fd0dc..e77d12746 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.3.2
+# sameersbn/gitlab:14.3.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.2
+docker pull sameersbn/gitlab:14.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.3.2
+ sameersbn/gitlab:14.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.3.2
+    sameersbn/gitlab:14.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:sanitize
+    sameersbn/gitlab:14.3.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake db:setup
+    sameersbn/gitlab:14.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.2
+docker pull sameersbn/gitlab:14.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f84a42182..839845e0b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.2
+14.3.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 463e21e21..2bdbdfaa0 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b25ee58c7..e1e5ad818 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 005a2cd3d..cd3b0ad6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b8c52049e..af0bf9aef 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.2
+docker pull sameersbn/gitlab:14.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.3.2
+sameersbn/gitlab:14.3.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 821e307d8..69c829ecd 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2aba3efce..e8d111f9c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.2
+    image: sameersbn/gitlab:14.3.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bfd0d67fd..fba0544be 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.3.2
+        image: sameersbn/gitlab:14.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 4e92b3c3eb1380935d1aaf72e5cc31b2f3e07798 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 26 Oct 2021 16:53:06 +0200
Subject: [PATCH 0683/1124] Upgrade GitLab CE to 14.4.0

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6ccdeafd1..630cc4dad 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.4.0**
+- gitlab: upgrade CE to v14.4.0
+- gitaly: upgrade to v14.4.0
+- gitlab-pages: upgrade to v1.46.0
+
 **14.3.3**
 - gitlab: upgrade CE to v14.3.3
 - gitaly: upgrade to v14.3.3
diff --git a/Dockerfile b/Dockerfile
index 8479d7bf1..fd0591064 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.3.3
+ARG VERSION=14.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
     RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
     GOLANG_VERSION=1.17.2 \
     GITLAB_SHELL_VERSION=13.21.1 \
-    GITLAB_PAGES_VERSION=1.44.0 \
-    GITALY_SERVER_VERSION=14.3.3 \
+    GITLAB_PAGES_VERSION=1.46.0 \
+    GITALY_SERVER_VERSION=14.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e77d12746..98c2c6e2f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.3.3
+# sameersbn/gitlab:14.4.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.3
+docker pull sameersbn/gitlab:14.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.3.3
+ sameersbn/gitlab:14.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.3.3
+    sameersbn/gitlab:14.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:sanitize
+    sameersbn/gitlab:14.4.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake db:setup
+    sameersbn/gitlab:14.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.3
+docker pull sameersbn/gitlab:14.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 839845e0b..72f51351f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.3
+14.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2bdbdfaa0..8cf7a8442 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e1e5ad818..4460024c4 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cd3b0ad6a..852a06923 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index af0bf9aef..0227627e1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.3.3
+docker pull sameersbn/gitlab:14.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.3.3
+sameersbn/gitlab:14.4.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 69c829ecd..b24706976 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e8d111f9c..0f163e807 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.3.3
+    image: sameersbn/gitlab:14.4.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fba0544be..5f9f67abd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.3.3
+        image: sameersbn/gitlab:14.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ef640356c05ded5ef5d1438e9f4ccec8e46b8579 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 29 Oct 2021 09:29:19 +0200
Subject: [PATCH 0684/1124] Upgrade GitLab CE to 14.4.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 630cc4dad..83bfd1aee 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.4.1**
+- gitlab: upgrade CE to v14.4.1
+- gitaly: upgrade to v14.4.1
+
 **14.4.0**
 - gitlab: upgrade CE to v14.4.0
 - gitaly: upgrade to v14.4.0
diff --git a/Dockerfile b/Dockerfile
index fd0591064..379f3b3f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.4.0
+ARG VERSION=14.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.2 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.46.0 \
-    GITALY_SERVER_VERSION=14.4.0 \
+    GITALY_SERVER_VERSION=14.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 98c2c6e2f..393f07356 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.4.0
+# sameersbn/gitlab:14.4.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.0
+docker pull sameersbn/gitlab:14.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.4.0
+ sameersbn/gitlab:14.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.4.0
+    sameersbn/gitlab:14.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:sanitize
+    sameersbn/gitlab:14.4.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake db:setup
+    sameersbn/gitlab:14.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.0
+docker pull sameersbn/gitlab:14.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 72f51351f..a74a70e5d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.0
+14.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8cf7a8442..8542b205f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4460024c4..7fa895f85 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 852a06923..5d82ea05c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0227627e1..f143b0317 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.0
+docker pull sameersbn/gitlab:14.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.4.0
+sameersbn/gitlab:14.4.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b24706976..88ca9466b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0f163e807..83a891405 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.0
+    image: sameersbn/gitlab:14.4.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5f9f67abd..770b7e4b0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.4.0
+        image: sameersbn/gitlab:14.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 8dc849f8fc9f369e76afa5c2d88f4d853bab7bc8 Mon Sep 17 00:00:00 2001
From: "Drahos, Vojtech" <vdrahos@netsuite.com>
Date: Tue, 16 Nov 2021 13:07:30 +0100
Subject: [PATCH 0685/1124] Upgrade GitLab 14.4.2, Redis 6.2.6

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  4 +-
 docker-compose.swarm.yml                |  4 +-
 docker-compose.yml                      |  4 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  4 +-
 docs/docker-compose-registry.yml        |  4 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 kubernetes/redis-rc.yml                 |  2 +-
 12 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 83bfd1aee..daea757e5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.4.2**
+- gitlab: upgrade CE to v14.4.2
+- gitaly: upgrade to v14.4.2
+- redis: upgrade to v6.2.6
+
 **14.4.1**
 - gitlab: upgrade CE to v14.4.1
 - gitaly: upgrade to v14.4.1
diff --git a/Dockerfile b/Dockerfile
index 379f3b3f8..07ad7b86e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.4.1
+ARG VERSION=14.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.2 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.46.0 \
-    GITALY_SERVER_VERSION=14.4.1 \
+    GITALY_SERVER_VERSION=14.4.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 393f07356..713570efc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.4.1
+# sameersbn/gitlab:14.4.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.1
+docker pull sameersbn/gitlab:14.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.4.1
+ sameersbn/gitlab:14.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.4.1
+    sameersbn/gitlab:14.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:sanitize
+    sameersbn/gitlab:14.4.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake db:setup
+    sameersbn/gitlab:14.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.1
+docker pull sameersbn/gitlab:14.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a74a70e5d..23b0b26d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.1
+14.4.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8542b205f..c7c515975 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: redis:5.0.9
+    image: redis:6.2.6
     command:
     - --loglevel warning
     volumes:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7fa895f85..ca4e5a270 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   redis:
-    image: redis:5.0.9
+    image: redis:6.2.6
     command:
     - --loglevel warning
     volumes:
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d82ea05c..48d2a0bb0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:6.2.6
     command:
     - --loglevel warning
     volumes:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f143b0317..4e0f6d789 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.1
+docker pull sameersbn/gitlab:14.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.4.1
+sameersbn/gitlab:14.4.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 88ca9466b..feb8bc631 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:5.0.9
+    image: redis:6.2.6
     command:
     - --loglevel warning
     volumes:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 83a891405..b9a8f6e23 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:5.0.9
+    image: redis:6.2.6
     command:
     - --loglevel warning
     volumes:
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.1
+    image: sameersbn/gitlab:14.4.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 770b7e4b0..c733b8d77 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.4.1
+        image: sameersbn/gitlab:14.4.2
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index 96a6119f9..be3351246 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: redis:5.0.9
+        image: redis:6.2.6
         ports:
         - name: redis
           containerPort: 6379

From 189ada39705fd0cf53ef762ec29a0dd13371775a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 7 Dec 2021 17:48:31 +0100
Subject: [PATCH 0686/1124] Upgrade GitLab CE to 14.4.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index daea757e5..2dcfd8bb6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.4.3**
+- gitlab: upgrade CE to v14.4.3
+- gitaly: upgrade to v14.4.3
+- golang: upgrade to v1.17.4
+
 **14.4.2**
 - gitlab: upgrade CE to v14.4.2
 - gitaly: upgrade to v14.4.2
diff --git a/Dockerfile b/Dockerfile
index 07ad7b86e..e78a5aa0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.4.2
+ARG VERSION=14.4.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
     RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
-    GOLANG_VERSION=1.17.2 \
+    GOLANG_VERSION=1.17.4 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.46.0 \
-    GITALY_SERVER_VERSION=14.4.2 \
+    GITALY_SERVER_VERSION=14.4.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 713570efc..11700b2e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.4.2
+# sameersbn/gitlab:14.4.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.2
+docker pull sameersbn/gitlab:14.4.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.4.2
+ sameersbn/gitlab:14.4.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.4.2
+    sameersbn/gitlab:14.4.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:sanitize
+    sameersbn/gitlab:14.4.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake db:setup
+    sameersbn/gitlab:14.4.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.4.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.2
+docker pull sameersbn/gitlab:14.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 23b0b26d3..b6371d7b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.2
+14.4.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c7c515975..3fe0e799f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ca4e5a270..acdd3e602 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 48d2a0bb0..a875d5410 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4e0f6d789..10fcd70bf 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.2
+docker pull sameersbn/gitlab:14.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.4.2
+sameersbn/gitlab:14.4.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index feb8bc631..b7400895a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b9a8f6e23..487e0d4d4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.2
+    image: sameersbn/gitlab:14.4.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c733b8d77..abb8a142c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.4.2
+        image: sameersbn/gitlab:14.4.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 82576f27d010f4caff4f26912aed3b137b6d74d7 Mon Sep 17 00:00:00 2001
From: sue445 <sue445@sue445.net>
Date: Fri, 6 Aug 2021 17:00:42 +0900
Subject: [PATCH 0687/1124] Fixed Pages config not being created when
 GITLAB_PAGES_ACCESS_CONTROL was disabled

---
 assets/runtime/functions | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 7dfe5d3e8..70a2e8b75 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1847,11 +1847,21 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
   else
     exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG}
   fi
+else
+  update_template ${GITLAB_PAGES_CONFIG} \
+      GITLAB_INSTALL_DIR
+
+  exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}
+  exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_SECRET}}/d" ${GITLAB_PAGES_CONFIG}
+  exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_REDIRECT_URI}}/d" ${GITLAB_PAGES_CONFIG}
+  exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_SECRET}}/d" ${GITLAB_PAGES_CONFIG}
+  exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}/d" ${GITLAB_PAGES_CONFIG}
+  exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG}
+fi
 
 cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
   -config ${GITLAB_PAGES_CONFIG}
 EOF
-fi
 
 cat >> /etc/supervisor/conf.d/gitlab-pages.conf <<EOF
 user=git

From 3778a7abb1ac7c603288735547821f6610da07be Mon Sep 17 00:00:00 2001
From: junorz <junvorz@gmail.com>
Date: Fri, 10 Dec 2021 06:36:17 +0900
Subject: [PATCH 0688/1124] fix: Stop all process before sending SIGTERM to
 supervisor. (#2422)

Issue detail: https://github.com/sameersbn/docker-gitlab/issues/2421
---
 entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index 1d9bc107c..fbfc4915d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -21,6 +21,7 @@ case ${1} in
         /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf &
         SUPERVISOR_PID=$!
         migrate_database
+        /usr/bin/supervisorctl stop all
         kill -15 $SUPERVISOR_PID
         if ps h -p $SUPERVISOR_PID > /dev/null ; then
         wait $SUPERVISOR_PID || true

From 75a0595dfc098b63270d647a85c4e77ffe17af4b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 10 Dec 2021 08:18:03 +0100
Subject: [PATCH 0689/1124] Revert "fix: Stop all process before sending
 SIGTERM to supervisor. (#2422)"

This reverts commit 3778a7abb1ac7c603288735547821f6610da07be.
---
 entrypoint.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index fbfc4915d..1d9bc107c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -21,7 +21,6 @@ case ${1} in
         /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf &
         SUPERVISOR_PID=$!
         migrate_database
-        /usr/bin/supervisorctl stop all
         kill -15 $SUPERVISOR_PID
         if ps h -p $SUPERVISOR_PID > /dev/null ; then
         wait $SUPERVISOR_PID || true

From b392d71265b0c2d2e03cd5ce41015d32b3679624 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 7 Dec 2021 21:37:12 +0100
Subject: [PATCH 0690/1124] Upgrade GitLab CE to 14.4.4

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2dcfd8bb6..6129d6dbf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.4.4**
+- gitlab: upgrade CE to v14.4.4
+- gitaly: upgrade to v14.4.4
+
 **14.4.3**
 - gitlab: upgrade CE to v14.4.3
 - gitaly: upgrade to v14.4.3
diff --git a/Dockerfile b/Dockerfile
index e78a5aa0f..7d57775b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.4.3
+ARG VERSION=14.4.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.4 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.4 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.46.0 \
-    GITALY_SERVER_VERSION=14.4.3 \
+    GITALY_SERVER_VERSION=14.4.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 11700b2e3..f44e49c61 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.4.3
+# sameersbn/gitlab:14.4.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.3
+docker pull sameersbn/gitlab:14.4.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.4.3
+ sameersbn/gitlab:14.4.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.4.3
+    sameersbn/gitlab:14.4.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:sanitize
+    sameersbn/gitlab:14.4.4 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake db:setup
+    sameersbn/gitlab:14.4.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.4.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.3
+docker pull sameersbn/gitlab:14.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.4
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b6371d7b9..3e344c329 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.3
+14.4.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 3fe0e799f..b0b17008f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index acdd3e602..38eaca40d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a875d5410..a814e93c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 10fcd70bf..038a5fdf6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.3
+docker pull sameersbn/gitlab:14.4.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.4.3
+sameersbn/gitlab:14.4.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b7400895a..d585fa5a4 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 487e0d4d4..75304d182 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.3
+    image: sameersbn/gitlab:14.4.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index abb8a142c..1b5b64fc7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.4.3
+        image: sameersbn/gitlab:14.4.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 1ff63bfaf731eab2ac9f3a275e98f7cf15bb23b6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 8 Dec 2021 19:06:51 +0100
Subject: [PATCH 0691/1124] Upgrade ruby to v.2.7.5

---
 Changelog.md | 1 +
 Dockerfile   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6129d6dbf..d5daa4019 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **14.4.4**
 - gitlab: upgrade CE to v14.4.4
 - gitaly: upgrade to v14.4.4
+- ruby: upgrade to v2.7.5
 
 **14.4.3**
 - gitlab: upgrade CE to v14.4.3
diff --git a/Dockerfile b/Dockerfile
index 7d57775b4..2cdb0a4c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20211006
 ARG VERSION=14.4.4
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.4 \
-    RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \
+    RUBY_VERSION=2.7.5 \
+    RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.4 \
     GITLAB_SHELL_VERSION=13.21.1 \
     GITLAB_PAGES_VERSION=1.46.0 \

From 48ad913ad8d20f15c267ad50bd877df10065f097 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Dec 2021 09:17:50 +0100
Subject: [PATCH 0692/1124] Upgrade GitLab CE to 14.5.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d5daa4019..49bad79b0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.5.0**
+- gitlab: upgrade CE to v14.5.0
+- gitaly: upgrade to v14.5.0
+- gitlab-pages: upgrade to v1.48.0
+- gitlab-shell: v13.22.0
+
 **14.4.4**
 - gitlab: upgrade CE to v14.4.4
 - gitaly: upgrade to v14.4.4
diff --git a/Dockerfile b/Dockerfile
index 2cdb0a4c8..81da50a1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.4.4
+ARG VERSION=14.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.4 \
-    GITLAB_SHELL_VERSION=13.21.1 \
-    GITLAB_PAGES_VERSION=1.46.0 \
-    GITALY_SERVER_VERSION=14.4.4 \
+    GITLAB_SHELL_VERSION=13.22.0 \
+    GITLAB_PAGES_VERSION=1.48.0 \
+    GITALY_SERVER_VERSION=14.5.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f44e49c61..e1386ad6b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.4.4
+# sameersbn/gitlab:14.5.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.4
+docker pull sameersbn/gitlab:14.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.4.4
+ sameersbn/gitlab:14.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.4.4
+    sameersbn/gitlab:14.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:sanitize
+    sameersbn/gitlab:14.5.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake db:setup
+    sameersbn/gitlab:14.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:env:info
+    sameersbn/gitlab:14.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.4.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.4
+docker pull sameersbn/gitlab:14.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3e344c329..d18453764 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.4
+14.5.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b0b17008f..4b8cb661e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 38eaca40d..26ee1af79 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a814e93c2..69a390c9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 038a5fdf6..559537b45 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.4.4
+docker pull sameersbn/gitlab:14.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.4.4
+sameersbn/gitlab:14.5.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d585fa5a4..025120b7f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 75304d182..0b250ad79 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.4.4
+    image: sameersbn/gitlab:14.5.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1b5b64fc7..74590421a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.4.4
+        image: sameersbn/gitlab:14.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From e83bb7e17a87c6d204e09563ad6fe4906502c1d9 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Dec 2021 10:21:24 +0100
Subject: [PATCH 0693/1124] Rename/remove build patch for gitlab-foss

- Expand if condition so that non-existent gitlab patches are not a problem
---
 assets/build/install.sh                                     | 6 +++---
 ...eature-checking-for-gitaly-on-a-fresh-install.patch.bak} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename assets/build/patches/{0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch => 0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak} (100%)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index e6850bf21..d8f48a531 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -82,9 +82,9 @@ exec_as_git git config --global advice.detachedHead false
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
 
-if [[ -d "${GITLAB_BUILD_DIR}/patches" ]]; then
-echo "Applying patches for gitlab-foss..."
-exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch
+if [[ -d "${GITLAB_BUILD_DIR}/patches" && -f "${GITLAB_BUILD_DIR}/patches/*.patch" ]]; then
+  echo "Applying patches for gitlab-foss..."
+  exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch
 fi
 
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak
similarity index 100%
rename from assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
rename to assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak

From ef0cc80838c08b61a4b91ed375760d1b5f0837d4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 23 Dec 2021 10:34:45 +0100
Subject: [PATCH 0694/1124] Upgrade GitLab CE to 14.5.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 49bad79b0..007936783 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.5.1**
+- gitlab: upgrade CE to v14.5.1
+- gitaly: upgrade to v14.5.1
+- gitlab-shell: v13.22.1
+
 **14.5.0**
 - gitlab: upgrade CE to v14.5.0
 - gitaly: upgrade to v14.5.0
diff --git a/Dockerfile b/Dockerfile
index 81da50a1f..d0637f860 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.5.0
+ARG VERSION=14.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.4 \
-    GITLAB_SHELL_VERSION=13.22.0 \
+    GITLAB_SHELL_VERSION=13.22.1 \
     GITLAB_PAGES_VERSION=1.48.0 \
-    GITALY_SERVER_VERSION=14.5.0 \
+    GITALY_SERVER_VERSION=14.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e1386ad6b..4febbadbd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.5.0
+# sameersbn/gitlab:14.5.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.0
+docker pull sameersbn/gitlab:14.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.5.0
+ sameersbn/gitlab:14.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.5.0
+    sameersbn/gitlab:14.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:sanitize
+    sameersbn/gitlab:14.5.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake db:setup
+    sameersbn/gitlab:14.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.0
+docker pull sameersbn/gitlab:14.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d18453764..0ee136b34 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.0
+14.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4b8cb661e..5b7762fc4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 26ee1af79..2a38ae824 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 69a390c9a..5b86eaf92 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 559537b45..740a111a1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.0
+docker pull sameersbn/gitlab:14.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.5.0
+sameersbn/gitlab:14.5.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 025120b7f..a4f53b646 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0b250ad79..243497f0f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.0
+    image: sameersbn/gitlab:14.5.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 74590421a..28ec771ba 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.5.0
+        image: sameersbn/gitlab:14.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 4eec8cfc3b4a96999518a5ff66ae673e3521cb87 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 23 Dec 2021 11:23:33 +0100
Subject: [PATCH 0695/1124] Upgrade GitLab CE to 14.5.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 007936783..79dfeafff 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.5.2**
+- gitlab: upgrade CE to v14.5.2
+- gitaly: upgrade to v14.5.2
+- golang: upgrade to v1.17.5
+
 **14.5.1**
 - gitlab: upgrade CE to v14.5.1
 - gitaly: upgrade to v14.5.1
diff --git a/Dockerfile b/Dockerfile
index d0637f860..a922ecab9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.5.1
+ARG VERSION=14.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.4 \
+    GOLANG_VERSION=1.17.5 \
     GITLAB_SHELL_VERSION=13.22.1 \
     GITLAB_PAGES_VERSION=1.48.0 \
-    GITALY_SERVER_VERSION=14.5.1 \
+    GITALY_SERVER_VERSION=14.5.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4febbadbd..d150289ac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.5.1
+# sameersbn/gitlab:14.5.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.1
+docker pull sameersbn/gitlab:14.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.5.1
+ sameersbn/gitlab:14.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.5.1
+    sameersbn/gitlab:14.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:sanitize
+    sameersbn/gitlab:14.5.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake db:setup
+    sameersbn/gitlab:14.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.1
+docker pull sameersbn/gitlab:14.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0ee136b34..7cfd50ed7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.1
+14.5.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5b7762fc4..dc2a342b8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2a38ae824..b72c3482f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b86eaf92..680d43084 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 740a111a1..869bfbff3 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.1
+docker pull sameersbn/gitlab:14.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.5.1
+sameersbn/gitlab:14.5.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a4f53b646..d6cd4e3b9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 243497f0f..de95836ce 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.1
+    image: sameersbn/gitlab:14.5.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 28ec771ba..0b339b867 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.5.1
+        image: sameersbn/gitlab:14.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 3df755b8f16441e7878876ed4502b5f74b628bb0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 Dec 2021 12:27:03 +0100
Subject: [PATCH 0696/1124] Upgrade GitLab CE to 14.6.0

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 79dfeafff..fd72ec0cd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.6.0**
+- gitlab: upgrade CE to v14.6.0
+- gitaly: upgrade to v14.6.0
+- gitlab-pages: upgrade to v1.49.0
+
 **14.5.2**
 - gitlab: upgrade CE to v14.5.2
 - gitaly: upgrade to v14.5.2
diff --git a/Dockerfile b/Dockerfile
index a922ecab9..2eec8d0fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.5.2
+ARG VERSION=14.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.5 \
     GITLAB_SHELL_VERSION=13.22.1 \
-    GITLAB_PAGES_VERSION=1.48.0 \
-    GITALY_SERVER_VERSION=14.5.2 \
+    GITLAB_PAGES_VERSION=1.49.0 \
+    GITALY_SERVER_VERSION=14.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d150289ac..73dda6ab0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.5.2
+# sameersbn/gitlab:14.6.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.2
+docker pull sameersbn/gitlab:14.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.5.2
+ sameersbn/gitlab:14.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.5.2
+    sameersbn/gitlab:14.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:sanitize
+    sameersbn/gitlab:14.6.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake db:setup
+    sameersbn/gitlab:14.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.2
+docker pull sameersbn/gitlab:14.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7cfd50ed7..df249f48e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.2
+14.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index dc2a342b8..8fd1bbc8b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b72c3482f..4e152183a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 680d43084..e65df7b60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 869bfbff3..de8a12474 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.5.2
+docker pull sameersbn/gitlab:14.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.5.2
+sameersbn/gitlab:14.6.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d6cd4e3b9..d3e1257c6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index de95836ce..689c8edd4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.5.2
+    image: sameersbn/gitlab:14.6.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0b339b867..4214563a4 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.5.2
+        image: sameersbn/gitlab:14.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d4ede13e3888b7a3186af7ba1e3e06b175fd97be Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 29 Dec 2021 22:03:57 +0100
Subject: [PATCH 0697/1124] Use new syntax for 'config/database.yml'

---
 assets/runtime/config/gitlabhq/database.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index 6ff2dbc83..0423a57c4 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -1,14 +1,15 @@
 #
-# PRODUCTION
+# PRODUCTION (here: non-decomposed database)
 #
 production:
-  adapter: postgresql
-  encoding: {{DB_ENCODING}}
-  database: {{DB_NAME}}
-  host: {{DB_HOST}}
-  port: {{DB_PORT}}
-  username: {{DB_USER}}
-  password: "{{DB_PASS}}"
-  pool: {{DB_POOL}}
-  prepared_statements: {{DB_PREPARED_STATEMENTS}}
+  main:
+    adapter: postgresql
+    encoding: {{DB_ENCODING}}
+    database: {{DB_NAME}}
+    host: {{DB_HOST}}
+    port: {{DB_PORT}}
+    username: {{DB_USER}}
+    password: "{{DB_PASS}}"
+    pool: {{DB_POOL}}
+    prepared_statements: {{DB_PREPARED_STATEMENTS}}
 

From 36330f536607636fd3ce69418cdd6d926daefd98 Mon Sep 17 00:00:00 2001
From: Paolo Mainardi <paolo.mainardi@sparkfabrik.com>
Date: Mon, 3 Jan 2022 16:32:16 +0100
Subject: [PATCH 0698/1124] Support actioncable

---
 assets/runtime/config/gitlabhq/cable.yml | 14 ++++++++++++++
 assets/runtime/functions                 | 13 +++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 assets/runtime/config/gitlabhq/cable.yml

diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml
new file mode 100644
index 000000000..dd454cb8e
--- /dev/null
+++ b/assets/runtime/config/gitlabhq/cable.yml
@@ -0,0 +1,14 @@
+# This is a template taken from here:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
+development:
+  adapter: redis
+  url: redis://localhost:6379
+  channel_prefix: gitlab_development
+test:
+  adapter: redis
+  url: redis://localhost:6379
+  channel_prefix: gitlab_test
+production:
+  adapter: redis
+  url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}}
+  channel_prefix: gitlab_production
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 70a2e8b75..870b46ace 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -19,6 +19,7 @@ GITLAB_PUMA_CONFIG="${GITLAB_INSTALL_DIR}/config/puma.rb"
 GITLAB_RELATIVE_URL_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/relative_url.rb"
 GITLAB_SMTP_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/smtp_settings.rb"
 GITLAB_RESQUE_CONFIG="${GITLAB_INSTALL_DIR}/config/resque.yml"
+GITLAB_ACTIONCABLE_CONFIG="${GITLAB_INSTALL_DIR}/config/cable.yml"
 GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml"
 GITLAB_ROBOTS_CONFIG="${GITLAB_INSTALL_DIR}/public/robots.txt"
 GITLAB_SHELL_CONFIG="${GITLAB_SHELL_INSTALL_DIR}/config.yml"
@@ -232,6 +233,17 @@ gitlab_configure_redis() {
     REDIS_DB_NUMBER
 }
 
+gitlab_configure_actioncable() {
+  echo -n "Configuring gitlab::actioncable"
+
+  gitlab_finalize_redis_parameters
+  gitlab_check_redis_connection
+
+  update_template ${GITLAB_ACTIONCABLE_CONFIG} \
+    REDIS_HOST \
+    REDIS_PORT
+}
+
 gitlab_configure_gitaly() {
   echo "Configuring gitlab::gitaly..."
   update_template ${GITLAB_GITALY_CONFIG} \
@@ -1743,6 +1755,7 @@ configure_gitlab() {
 
   gitlab_configure_database
   gitlab_configure_redis
+  gitlab_configure_actioncable
   gitlab_configure_secrets
   gitlab_configure_sidekiq
   gitlab_configure_gitaly

From 0a24da2cfe9d1da3031e6c95a96bcb96e8b00811 Mon Sep 17 00:00:00 2001
From: Paolo Mainardi <paolo.mainardi@sparkfabrik.com>
Date: Mon, 3 Jan 2022 16:54:08 +0100
Subject: [PATCH 0699/1124] Copy cable.yml template file

---
 assets/runtime/functions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 870b46ace..27c1c3ca3 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1661,6 +1661,7 @@ install_configuration_templates() {
   install_template ${GITLAB_USER}: gitlabhq/resque.yml ${GITLAB_RESQUE_CONFIG} 0640
   install_template ${GITLAB_USER}: gitlabhq/secrets.yml ${GITLAB_SECRETS_CONFIG} 0600
   install_template ${GITLAB_USER}: gitlab-shell/config.yml ${GITLAB_SHELL_CONFIG} 0640
+  install_template ${GITLAB_USER}: gitlabhq/cable.yml ${GITLAB_ACTIONCABLE_CONFIG} 0640
 
   if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
     install_template ${GITLAB_USER}: gitlabhq/relative_url.rb ${GITLAB_RELATIVE_URL_CONFIG} 0644

From 09e76bb2e7d4c805bfc2cb70cb1b0ca89cd60216 Mon Sep 17 00:00:00 2001
From: Paolo Mainardi <paolo.mainardi@sparkfabrik.com>
Date: Mon, 3 Jan 2022 18:28:10 +0100
Subject: [PATCH 0700/1124] Missing redis db number

---
 assets/runtime/functions | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 27c1c3ca3..5a74bae83 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -241,7 +241,8 @@ gitlab_configure_actioncable() {
 
   update_template ${GITLAB_ACTIONCABLE_CONFIG} \
     REDIS_HOST \
-    REDIS_PORT
+    REDIS_PORT \
+    REDIS_DB_NUMBER
 }
 
 gitlab_configure_gitaly() {

From de716d0a2815bcdf24ffd4ad6e5926a71c5b451c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 5 Jan 2022 18:14:09 +0100
Subject: [PATCH 0701/1124] Upgrade GitLab CE to 14.6.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fd72ec0cd..a32e2392b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.6.1**
+- gitlab: upgrade CE to v14.6.1
+- gitaly: upgrade to v14.6.1
+
 **14.6.0**
 - gitlab: upgrade CE to v14.6.0
 - gitaly: upgrade to v14.6.0
diff --git a/Dockerfile b/Dockerfile
index 2eec8d0fe..88fd8cb30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.6.0
+ARG VERSION=14.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.5 \
     GITLAB_SHELL_VERSION=13.22.1 \
     GITLAB_PAGES_VERSION=1.49.0 \
-    GITALY_SERVER_VERSION=14.6.0 \
+    GITALY_SERVER_VERSION=14.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 73dda6ab0..d591244c4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.6.0
+# sameersbn/gitlab:14.6.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.0
+docker pull sameersbn/gitlab:14.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.6.0
+ sameersbn/gitlab:14.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.6.0
+    sameersbn/gitlab:14.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:sanitize
+    sameersbn/gitlab:14.6.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake db:setup
+    sameersbn/gitlab:14.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.0
+docker pull sameersbn/gitlab:14.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index df249f48e..e4ce12fcf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.0
+14.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8fd1bbc8b..e3243821c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4e152183a..bc8305526 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e65df7b60..dea410372 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index de8a12474..b3b6cf8b0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.0
+docker pull sameersbn/gitlab:14.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.6.0
+sameersbn/gitlab:14.6.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d3e1257c6..f5b5ba8d1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 689c8edd4..9224b9f93 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.0
+    image: sameersbn/gitlab:14.6.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4214563a4..4c21f6970 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.6.0
+        image: sameersbn/gitlab:14.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From e5dc6e6067f04d5107a528edbc792de07cb9c5ea Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 12 Jan 2022 21:50:04 +0100
Subject: [PATCH 0702/1124] Upgrade GitLab CE to 14.6.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a32e2392b..6b61bd9b1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.6.2**
+- gitlab: upgrade CE to v14.6.2
+- gitaly: upgrade to v14.6.2
+- golang: upgrade to v1.17.6
+
 **14.6.1**
 - gitlab: upgrade CE to v14.6.1
 - gitaly: upgrade to v14.6.1
diff --git a/Dockerfile b/Dockerfile
index 88fd8cb30..046ed2b8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20211006
 
-ARG VERSION=14.6.1
+ARG VERSION=14.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.5 \
+    GOLANG_VERSION=1.17.6 \
     GITLAB_SHELL_VERSION=13.22.1 \
     GITLAB_PAGES_VERSION=1.49.0 \
-    GITALY_SERVER_VERSION=14.6.1 \
+    GITALY_SERVER_VERSION=14.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d591244c4..17fb6a2ab 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.6.1
+# sameersbn/gitlab:14.6.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.1
+docker pull sameersbn/gitlab:14.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.6.1
+ sameersbn/gitlab:14.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.6.1
+    sameersbn/gitlab:14.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:sanitize
+    sameersbn/gitlab:14.6.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake db:setup
+    sameersbn/gitlab:14.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.1
+docker pull sameersbn/gitlab:14.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e4ce12fcf..1487d806c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.1
+14.6.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e3243821c..2c84114e6 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index bc8305526..4c8601715 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dea410372..ba4ddc355 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b3b6cf8b0..991d0b502 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.1
+docker pull sameersbn/gitlab:14.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.6.1
+sameersbn/gitlab:14.6.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f5b5ba8d1..5b1293159 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 9224b9f93..c8ecd11ab 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.1
+    image: sameersbn/gitlab:14.6.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4c21f6970..47de53203 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.6.1
+        image: sameersbn/gitlab:14.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From d26bba3bdd5d912c9b5263734923f63e9210c82e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 15 Jan 2022 09:38:53 +0100
Subject: [PATCH 0703/1124] Upgrade ubuntu base image

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 6b61bd9b1..5f56a7f8c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v14.6.2
 - gitaly: upgrade to v14.6.2
 - golang: upgrade to v1.17.6
+- ubuntu: upgrade to focal-20220105
 
 **14.6.1**
 - gitlab: upgrade CE to v14.6.1
diff --git a/Dockerfile b/Dockerfile
index 046ed2b8a..fe6aead53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20211006
+FROM ubuntu:focal-focal-20220105
 
 ARG VERSION=14.6.2
 

From b4c1955800161484f55bf630613c353b520bdf18 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 15 Jan 2022 09:45:39 +0100
Subject: [PATCH 0704/1124] Fix incorrect image tag

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

diff --git a/Dockerfile b/Dockerfile
index fe6aead53..e4ff58213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-focal-20220105
+FROM ubuntu:focal-20220105
 
 ARG VERSION=14.6.2
 

From 5339ce5a8e5afa1534a17fe9fef6488c24e70b1c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 20 Jan 2022 05:40:33 +0100
Subject: [PATCH 0705/1124] Upgrade GitLab CE to 14.6.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5f56a7f8c..d2f2e7321 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.6.3**
+- gitlab: upgrade CE to v14.6.3
+- gitaly: upgrade to v14.6.3
+
 **14.6.2**
 - gitlab: upgrade CE to v14.6.2
 - gitaly: upgrade to v14.6.2
diff --git a/Dockerfile b/Dockerfile
index e4ff58213..014ae0bc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220105
 
-ARG VERSION=14.6.2
+ARG VERSION=14.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.6 \
     GITLAB_SHELL_VERSION=13.22.1 \
     GITLAB_PAGES_VERSION=1.49.0 \
-    GITALY_SERVER_VERSION=14.6.2 \
+    GITALY_SERVER_VERSION=14.6.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 17fb6a2ab..142a4be1a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.6.2
+# sameersbn/gitlab:14.6.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.2
+docker pull sameersbn/gitlab:14.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.6.2
+ sameersbn/gitlab:14.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.6.2
+    sameersbn/gitlab:14.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:sanitize
+    sameersbn/gitlab:14.6.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake db:setup
+    sameersbn/gitlab:14.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.2
+docker pull sameersbn/gitlab:14.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1487d806c..d164342cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.2
+14.6.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2c84114e6..1a5b49322 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4c8601715..8bb9f8935 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ba4ddc355..87f902d32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 991d0b502..6b92e8424 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.2
+docker pull sameersbn/gitlab:14.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.6.2
+sameersbn/gitlab:14.6.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5b1293159..685c06e15 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c8ecd11ab..34cd52ba4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.2
+    image: sameersbn/gitlab:14.6.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 47de53203..7b535860a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.6.2
+        image: sameersbn/gitlab:14.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 54b279014485a4cea79ac7254210a6dd16b8b434 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 24 Jan 2022 16:20:43 +0100
Subject: [PATCH 0706/1124] Upgrade GitLab CE to 14.7.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d2f2e7321..80dc5574c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.7.0**
+- gitlab: upgrade CE to v14.7.0
+- gitaly: upgrade to v14.7.0
+- gitlab-shell: v13.22.2
+- gitlab-pages: upgrade to v1.51.0
+
 **14.6.3**
 - gitlab: upgrade CE to v14.6.3
 - gitaly: upgrade to v14.6.3
diff --git a/Dockerfile b/Dockerfile
index 014ae0bc5..b1fbba6f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220105
 
-ARG VERSION=14.6.3
+ARG VERSION=14.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.6 \
-    GITLAB_SHELL_VERSION=13.22.1 \
-    GITLAB_PAGES_VERSION=1.49.0 \
-    GITALY_SERVER_VERSION=14.6.3 \
+    GITLAB_SHELL_VERSION=13.22.2 \
+    GITLAB_PAGES_VERSION=1.51.0 \
+    GITALY_SERVER_VERSION=14.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 142a4be1a..ddd8e63c9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.6.3
+# sameersbn/gitlab:14.7.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.3
+docker pull sameersbn/gitlab:14.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.6.3
+ sameersbn/gitlab:14.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.6.3
+    sameersbn/gitlab:14.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:sanitize
+    sameersbn/gitlab:14.7.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake db:setup
+    sameersbn/gitlab:14.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.3
+docker pull sameersbn/gitlab:14.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d164342cf..654afc8e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.3
+14.7.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1a5b49322..a50d47259 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8bb9f8935..97a209e1c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 87f902d32..a9292edda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6b92e8424..e1a5e811b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.6.3
+docker pull sameersbn/gitlab:14.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.6.3
+sameersbn/gitlab:14.7.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 685c06e15..c3b26b0b8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 34cd52ba4..e26aba08d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.6.3
+    image: sameersbn/gitlab:14.7.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7b535860a..4db0488eb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.6.3
+        image: sameersbn/gitlab:14.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From af9bfee78fa4faa2c36f2fe117307aa640879e3e Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 22 Jan 2022 13:54:38 +0900
Subject: [PATCH 0707/1124] add patch to change SSH_ALGORITHMS_PATH

To enable ssh host key info in help page
---
 assets/build/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index d8f48a531..4161b52da 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -158,6 +158,9 @@ exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_
 # revert `rake gitlab:setup` changes from gitlabhq/gitlabhq@a54af831bae023770bf9b2633cc45ec0d5f5a66a
 exec_as_git sed -i 's/db:reset/db:setup/' ${GITLAB_INSTALL_DIR}/lib/tasks/gitlab/setup.rake
 
+# change SSH_ALGORITHM_PATH - we have moved host keys in ${GITLAB_DATA_DIR}/ssh/ to persist them
+exec_as_git sed -i "s:/etc/ssh/:/${GITLAB_DATA_DIR}/ssh/:g" ${GITLAB_INSTALL_DIR}/app/models/instance_configuration.rb
+
 cd ${GITLAB_INSTALL_DIR}
 
 # install gems, use local cache if available

From f1a97e1be25db41117df6a8a9dedc77990fdbe98 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 3 Jan 2022 15:35:15 +0900
Subject: [PATCH 0708/1124] add prometheus_multiproc_dir environment variable

to avoid 500 error on admin/metric page
see #2387
---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 014ae0bc5..82734b296 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,8 @@ COPY assets/runtime/ ${GITLAB_RUNTIME_DIR}/
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod 755 /sbin/entrypoint.sh
 
+ENV prometheus_multiproc_dir="/dev/shm"
+
 ARG BUILD_DATE
 ARG VCS_REF
 

From 2448c6aada2888bc0439cbe6e158525f605ca662 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 28 Jan 2022 02:12:35 +0900
Subject: [PATCH 0709/1124] add terraform/packages dir to initialize_datadir()

Also add them to sanitize_datadir()

Note that the backup will fail if these directories do not exist
with each feature enabled.
---
 assets/runtime/functions | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5a74bae83..8d1ca5ecc 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1501,6 +1501,13 @@ initialize_datadir() {
   chmod u+rwX ${GITLAB_LFS_OBJECTS_DIR}
   chown ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR}
 
+  # create terraform_state directory
+  # TODO : parametarize path and replace with it (e.g. GITLAB_TERRAFORM_STATE_STORAGE_PATH) - see sameersbn/gitlab#2438
+  # TODO : wrap with "if [[ _ENABLED == true ]]" condition
+  mkdir -p ${GITLAB_SHARED_DIR}/terraform_state
+  chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state
+  chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state
+
   # create registry dir
   if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then
     mkdir -p ${GITLAB_REGISTRY_DIR}
@@ -1508,6 +1515,13 @@ initialize_datadir() {
     chown ${GITLAB_USER}: ${GITLAB_REGISTRY_DIR}
   fi
 
+  # create packages directory
+  if [[ ${GITLAB_PACKAGES_ENABLED} == true ]]; then
+    mkdir -p ${GITLAB_PACKAGES_DIR}
+    chmod u+rwX ${GITLAB_PACKAGES_DIR}
+    chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR}
+  fi
+
   # create the backups directory
   mkdir -p ${GITLAB_BACKUP_DIR}
   if [[ ${GITLAB_BACKUP_DIR_CHOWN} == true ]]; then
@@ -1574,11 +1588,21 @@ sanitize_datadir() {
   chmod -R u+rwX ${GITLAB_LFS_OBJECTS_DIR}
   chown -R ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR}
 
+  # create terraform_state directory
+  # TODO : wrap with "if [[ _ENABLED ]]" condition
+  chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state
+  chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state
+
   if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then
     chmod -R u+rwX ${GITLAB_REGISTRY_DIR}
     chown -R ${GITLAB_USER}: ${GITLAB_REGISTRY_DIR}
   fi
 
+  if [[ ${GITLAB_PACKAGES_ENABLED} ]]; then
+    chmod u+rwX ${GITLAB_PACKAGES_DIR}
+    chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR}
+  fi
+
   find ${GITLAB_DATA_DIR}/uploads -type f -exec chmod 0644 {} \;
   find ${GITLAB_DATA_DIR}/uploads -type d -not -path ${GITLAB_DATA_DIR}/uploads -exec chmod 0755 {} \;
   chmod 0700 ${GITLAB_DATA_DIR}/uploads/

From d16c94f961d458891e871fc78fe465a07c252895 Mon Sep 17 00:00:00 2001
From: Olivier Mueller <om-lists-github@omx.ch>
Date: Fri, 4 Feb 2022 13:56:59 +0100
Subject: [PATCH 0710/1124] Upgrade GitLab CE to 14.7.1 -
 https://about.gitlab.com/releases/2022/02/03/security-release-gitlab-14-7-1-released/

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 80dc5574c..2a09834d0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.7.1**
+- gitlab: upgrade CE to v14.7.1
+- gitaly: upgrade to v14.7.1
+
 **14.7.0**
 - gitlab: upgrade CE to v14.7.0
 - gitaly: upgrade to v14.7.0
diff --git a/Dockerfile b/Dockerfile
index 7ad21cb90..a7b5e58e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220105
 
-ARG VERSION=14.7.0
+ARG VERSION=14.7.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.6 \
     GITLAB_SHELL_VERSION=13.22.2 \
     GITLAB_PAGES_VERSION=1.51.0 \
-    GITALY_SERVER_VERSION=14.7.0 \
+    GITALY_SERVER_VERSION=14.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ddd8e63c9..3007f695a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.7.0
+# sameersbn/gitlab:14.7.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.0
+docker pull sameersbn/gitlab:14.7.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.7.0
+ sameersbn/gitlab:14.7.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.7.0
+    sameersbn/gitlab:14.7.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:sanitize
+    sameersbn/gitlab:14.7.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake db:setup
+    sameersbn/gitlab:14.7.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.7.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.0
+docker pull sameersbn/gitlab:14.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 654afc8e1..a984c5e3f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.0
+14.7.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a50d47259..663b814a8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 97a209e1c..3d2e92f99 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a9292edda..e6ee353b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e1a5e811b..619632b7e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.0
+docker pull sameersbn/gitlab:14.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.7.0
+sameersbn/gitlab:14.7.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c3b26b0b8..7aee04e32 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e26aba08d..1acd24351 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.0
+    image: sameersbn/gitlab:14.7.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4db0488eb..73cf7d46d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.7.0
+        image: sameersbn/gitlab:14.7.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 73a47c40b651401ac385295fa8e4628ea719d96e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 10 Feb 2022 18:16:28 +0100
Subject: [PATCH 0711/1124] Upgrade GitLab CE to 14.7.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2a09834d0..1e211ad21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.7.2**
+- gitlab: upgrade CE to v14.7.2
+- gitaly: upgrade to v14.7.2
+- ubuntu: upgrade to focal-20220113
+
 **14.7.1**
 - gitlab: upgrade CE to v14.7.1
 - gitaly: upgrade to v14.7.1
diff --git a/Dockerfile b/Dockerfile
index a7b5e58e3..ebcaae924 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20220105
+FROM ubuntu:focal-20220113
 
-ARG VERSION=14.7.1
+ARG VERSION=14.7.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.6 \
     GITLAB_SHELL_VERSION=13.22.2 \
     GITLAB_PAGES_VERSION=1.51.0 \
-    GITALY_SERVER_VERSION=14.7.1 \
+    GITALY_SERVER_VERSION=14.7.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3007f695a..2d73dcf8c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.7.1
+# sameersbn/gitlab:14.7.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.1
+docker pull sameersbn/gitlab:14.7.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.7.1
+ sameersbn/gitlab:14.7.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.7.1
+    sameersbn/gitlab:14.7.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:sanitize
+    sameersbn/gitlab:14.7.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake db:setup
+    sameersbn/gitlab:14.7.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.7.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.1
+docker pull sameersbn/gitlab:14.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a984c5e3f..a19d5f0f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.1
+14.7.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 663b814a8..f7a014624 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 3d2e92f99..2fe91f01c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e6ee353b9..0df130e2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 619632b7e..c6328c499 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.1
+docker pull sameersbn/gitlab:14.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.7.1
+sameersbn/gitlab:14.7.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7aee04e32..6c90c6fa2 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1acd24351..ac392b8d3 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.1
+    image: sameersbn/gitlab:14.7.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 73cf7d46d..2667d8865 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.7.1
+        image: sameersbn/gitlab:14.7.2
         env:
         - name: TZ
           value: Asia/Kolkata

From e5fddf1ae6455811758a2f081c5bda65184fb053 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 17 Feb 2022 08:14:52 +0100
Subject: [PATCH 0712/1124] Upgrade GitLab CE to 14.7.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1e211ad21..3f80a50d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.7.3**
+- gitlab: upgrade CE to v14.7.2
+- gitaly: upgrade to v14.7.2
+- golang: upgrade to v1.17.7
+
 **14.7.2**
 - gitlab: upgrade CE to v14.7.2
 - gitaly: upgrade to v14.7.2
diff --git a/Dockerfile b/Dockerfile
index ebcaae924..977bd4fb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220113
 
-ARG VERSION=14.7.2
+ARG VERSION=14.7.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.6 \
+    GOLANG_VERSION=1.17.7 \
     GITLAB_SHELL_VERSION=13.22.2 \
     GITLAB_PAGES_VERSION=1.51.0 \
-    GITALY_SERVER_VERSION=14.7.2 \
+    GITALY_SERVER_VERSION=14.7.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2d73dcf8c..c17434210 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.7.2
+# sameersbn/gitlab:14.7.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.2
+docker pull sameersbn/gitlab:14.7.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.7.2
+ sameersbn/gitlab:14.7.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.7.2
+    sameersbn/gitlab:14.7.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:sanitize
+    sameersbn/gitlab:14.7.3 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake db:setup
+    sameersbn/gitlab:14.7.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.7.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.2
+docker pull sameersbn/gitlab:14.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.3
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a19d5f0f0..e8f593125 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.2
+14.7.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f7a014624..9ebda0432 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2fe91f01c..2bbff08ef 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 0df130e2f..7b514c2c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c6328c499..9203357b8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.2
+docker pull sameersbn/gitlab:14.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.7.2
+sameersbn/gitlab:14.7.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6c90c6fa2..a456c905d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ac392b8d3..95b15e4db 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.2
+    image: sameersbn/gitlab:14.7.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2667d8865..a498ef417 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.7.2
+        image: sameersbn/gitlab:14.7.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 4943e1ffc0e5cc6a22f77cdcabbee04ec1b7c9af Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 19 Feb 2022 14:02:16 +0900
Subject: [PATCH 0713/1124] replace non-break space with normal space

especially, rails warns when "non-break space" found
in configuration file (such as cable.yml)
---
 assets/runtime/config/gitlabhq/cable.yml | 2 +-
 assets/runtime/env-defaults              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml
index dd454cb8e..d36e74fe1 100644
--- a/assets/runtime/config/gitlabhq/cable.yml
+++ b/assets/runtime/config/gitlabhq/cable.yml
@@ -1,5 +1,5 @@
 # This is a template taken from here:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
 development:
   adapter: redis
   url: redis://localhost:6379
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 7dac47c09..8015ec1cb 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -295,7 +295,7 @@ AWS_BACKUP_ENCRYPTION=${AWS_BACKUP_ENCRYPTION}
 AWS_BACKUP_STORAGE_CLASS=${AWS_BACKUP_STORAGE_CLASS:-STANDARD}
 AWS_BACKUP_SIGNATURE_VERSION=${AWS_BACKUP_SIGNATURE_VERSION:-4}
 
-### GCS BACKUPS
+### GCS BACKUPS
 GCS_BACKUPS=${GCS_BACKUPS:-false}
 GCS_BACKUP_ACCESS_KEY_ID=${GCS_BACKUP_ACCESS_KEY_ID}
 GCS_BACKUP_SECRET_ACCESS_KEY=${GCS_BACKUP_SECRET_ACCESS_KEY}

From 98daf7b467e5c4eea12e6b1c4dc2ddb615216f5b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 20 Feb 2022 20:38:09 +0100
Subject: [PATCH 0714/1124] Fix incorrect version numbers

---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3f80a50d8..8b484972f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,8 +3,8 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
 **14.7.3**
-- gitlab: upgrade CE to v14.7.2
-- gitaly: upgrade to v14.7.2
+- gitlab: upgrade CE to v14.7.3
+- gitaly: upgrade to v14.7.3
 - golang: upgrade to v1.17.7
 
 **14.7.2**

From ae00397a915df6b695cc5e9150c3e7be42d32002 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 23 Feb 2022 19:30:39 +0100
Subject: [PATCH 0715/1124] Upgrade GitLab CE to 14.8.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8b484972f..3f650033e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.8.0**
+- gitlab: upgrade CE to v14.8.0
+- gitaly: upgrade to v14.8.0
+- gitlab-pages: upgrade to v1.54.0
+- - gitlab-shell: v13.24.2
+
 **14.7.3**
 - gitlab: upgrade CE to v14.7.3
 - gitaly: upgrade to v14.7.3
diff --git a/Dockerfile b/Dockerfile
index 977bd4fb6..2a1171c31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220113
 
-ARG VERSION=14.7.3
+ARG VERSION=14.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.7 \
-    GITLAB_SHELL_VERSION=13.22.2 \
-    GITLAB_PAGES_VERSION=1.51.0 \
-    GITALY_SERVER_VERSION=14.7.3 \
+    GITLAB_SHELL_VERSION=13.23.2 \
+    GITLAB_PAGES_VERSION=1.54.0 \
+    GITALY_SERVER_VERSION=14.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c17434210..90d1f12cc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.7.3
+# sameersbn/gitlab:14.8.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.3
+docker pull sameersbn/gitlab:14.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.7.3
+ sameersbn/gitlab:14.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.7.3
+    sameersbn/gitlab:14.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:sanitize
+    sameersbn/gitlab:14.8.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake db:setup
+    sameersbn/gitlab:14.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.3
+docker pull sameersbn/gitlab:14.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e8f593125..9306ff90b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.3
+14.8.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9ebda0432..6a2ad36d8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2bbff08ef..e55c9480b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b514c2c7..d87f47a30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9203357b8..4fde1c7fe 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.7.3
+docker pull sameersbn/gitlab:14.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.7.3
+sameersbn/gitlab:14.8.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a456c905d..68113fd0a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 95b15e4db..deff78dd3 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.7.3
+    image: sameersbn/gitlab:14.8.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a498ef417..98d3347fc 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.7.3
+        image: sameersbn/gitlab:14.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 341b0ab04346da92fad1baf58e63b04c2af92eec Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 23 Feb 2022 21:08:26 +0100
Subject: [PATCH 0716/1124] Fix incorrect informations

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3f650033e..fa87b41fd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v14.8.0
 - gitaly: upgrade to v14.8.0
 - gitlab-pages: upgrade to v1.54.0
-- - gitlab-shell: v13.24.2
+- gitlab-shell: v13.23.2
 
 **14.7.3**
 - gitlab: upgrade CE to v14.7.3

From f89a0be917442dd3b92e414f4ecffb33bbdf8c7a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 23 Feb 2022 21:07:31 +0100
Subject: [PATCH 0717/1124] Upgrade GitLab CE to 14.8.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fa87b41fd..f451e476f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.8.1**
+- gitlab: upgrade CE to v14.8.1
+- gitaly: upgrade to v14.8.1
+
 **14.8.0**
 - gitlab: upgrade CE to v14.8.0
 - gitaly: upgrade to v14.8.0
diff --git a/Dockerfile b/Dockerfile
index 2a1171c31..5b5b005d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220113
 
-ARG VERSION=14.8.0
+ARG VERSION=14.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.7 \
     GITLAB_SHELL_VERSION=13.23.2 \
     GITLAB_PAGES_VERSION=1.54.0 \
-    GITALY_SERVER_VERSION=14.8.0 \
+    GITALY_SERVER_VERSION=14.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 90d1f12cc..c1b7aa920 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.8.0
+# sameersbn/gitlab:14.8.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.0
+docker pull sameersbn/gitlab:14.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.8.0
+ sameersbn/gitlab:14.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.8.0
+    sameersbn/gitlab:14.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:sanitize
+    sameersbn/gitlab:14.8.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake db:setup
+    sameersbn/gitlab:14.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.0
+docker pull sameersbn/gitlab:14.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9306ff90b..6ebe0c0b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.0
+14.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6a2ad36d8..1314e0967 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e55c9480b..515df134d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d87f47a30..b51b27c08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4fde1c7fe..6bc5e4c0d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.0
+docker pull sameersbn/gitlab:14.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.8.0
+sameersbn/gitlab:14.8.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 68113fd0a..23edd50ab 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index deff78dd3..489820a51 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.0
+    image: sameersbn/gitlab:14.8.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 98d3347fc..c2fd96721 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.8.0
+        image: sameersbn/gitlab:14.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 5b230647a51d6994e3ae0f89c283556c10e4dcf7 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 26 Feb 2022 09:13:41 +0100
Subject: [PATCH 0718/1124] Upgrade GitLab CE to 14.8.2

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f451e476f..242661029 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.8.2**
+- gitlab: upgrade CE to v14.8.2
+- gitaly: upgrade to v14.8.2
+
 **14.8.1**
 - gitlab: upgrade CE to v14.8.1
 - gitaly: upgrade to v14.8.1
diff --git a/Dockerfile b/Dockerfile
index 5b5b005d4..e3f5e1130 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220113
 
-ARG VERSION=14.8.1
+ARG VERSION=14.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.7 \
     GITLAB_SHELL_VERSION=13.23.2 \
     GITLAB_PAGES_VERSION=1.54.0 \
-    GITALY_SERVER_VERSION=14.8.1 \
+    GITALY_SERVER_VERSION=14.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c1b7aa920..c994ae4f2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.8.1
+# sameersbn/gitlab:14.8.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.1
+docker pull sameersbn/gitlab:14.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.8.1
+ sameersbn/gitlab:14.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.8.1
+    sameersbn/gitlab:14.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:sanitize
+    sameersbn/gitlab:14.8.2 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake db:setup
+    sameersbn/gitlab:14.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.1
+docker pull sameersbn/gitlab:14.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.2
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6ebe0c0b0..9843c3ced 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.1
+14.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1314e0967..b7eb2a818 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 515df134d..395aaa1e7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b51b27c08..fc3732b7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6bc5e4c0d..93285e27e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.1
+docker pull sameersbn/gitlab:14.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.8.1
+sameersbn/gitlab:14.8.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 23edd50ab..e68990c1e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 489820a51..c96f5cdf5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.1
+    image: sameersbn/gitlab:14.8.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c2fd96721..2f6bb5099 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.8.1
+        image: sameersbn/gitlab:14.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From a9b4feb77be54a18706131f7de222fb94220abf8 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 4 Mar 2022 22:49:12 +0900
Subject: [PATCH 0719/1124] add NGINX_CUSTOM_GITLAB_SERVER_CONFIG

---
 README.md                              | 1 +
 assets/runtime/config/nginx/gitlab     | 1 +
 assets/runtime/config/nginx/gitlab-ssl | 2 ++
 assets/runtime/env-defaults            | 1 +
 assets/runtime/functions               | 3 ++-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c994ae4f2..ead2ef2a6 100644
--- a/README.md
+++ b/README.md
@@ -1001,6 +1001,7 @@ Below is the complete list of available options that can be used to customize yo
 | `NGINX_X_FORWARDED_PROTO` | Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. |
 | `NGINX_REAL_IP_RECURSIVE` | set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. |
 | `NGINX_REAL_IP_TRUSTED_ADDRESSES` | You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. |
+| `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` | Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. |
 | `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` |
 | `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. |
 | `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. |
diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index b08c8bff4..c2e22a297 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -94,4 +94,5 @@ server {
     internal;
   }
 
+  {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}}
 }
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 7e7be7bfc..893232b72 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -139,4 +139,6 @@ server {
     root {{GITLAB_INSTALL_DIR}}/public;
     internal;
   }
+
+  {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}}
 }
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 8015ec1cb..661219a32 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -312,6 +312,7 @@ case ${GITLAB_HTTPS} in
   true) NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-https} ;;
   *)    NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-\$scheme} ;;
 esac
+NGINX_CUSTOM_GITLAB_SERVER_CONFIG=${NGINX_CUSTOM_GITLAB_SERVER_CONFIG:-}
 
 ## MAIL DELIVERY
 SMTP_DOMAIN=${SMTP_DOMAIN:-www.gmail.com}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8d1ca5ecc..b42936df0 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1329,7 +1329,8 @@ nginx_configure_gitlab() {
     GITLAB_PORT \
     NGINX_PROXY_BUFFERING \
     NGINX_ACCEL_BUFFERING \
-    NGINX_X_FORWARDED_PROTO
+    NGINX_X_FORWARDED_PROTO \
+    NGINX_CUSTOM_GITLAB_SERVER_CONFIG
 
   nginx_configure_gitlab_ssl
   nginx_configure_gitlab_hsts

From b8c49be9f4e5dbc563665caf6d58f58592dc8db4 Mon Sep 17 00:00:00 2001
From: Olivier Mueller <om-lists-github@omx.ch>
Date: Tue, 22 Mar 2022 20:35:35 +0100
Subject: [PATCH 0720/1124] Upgrade GitLab CE to 14.8.4 -
 https://about.gitlab.com/releases/2022/03/16/gitlab-14-8-4-released/

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 242661029..58080ee08 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.8.4**
+- gitlab: upgrade CE to v14.8.4
+- gitaly: upgrade to v14.8.4
+
 **14.8.2**
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
diff --git a/Dockerfile b/Dockerfile
index e3f5e1130..93f888584 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220113
 
-ARG VERSION=14.8.2
+ARG VERSION=14.8.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.7 \
     GITLAB_SHELL_VERSION=13.23.2 \
     GITLAB_PAGES_VERSION=1.54.0 \
-    GITALY_SERVER_VERSION=14.8.2 \
+    GITALY_SERVER_VERSION=14.8.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c994ae4f2..2557a605e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.8.2
+# sameersbn/gitlab:14.8.4
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.8.2
+ sameersbn/gitlab:14.8.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:sanitize
+    sameersbn/gitlab:14.8.4 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake db:setup
+    sameersbn/gitlab:14.8.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.8.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.4
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9843c3ced..5ccaa66f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.2
+14.8.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b7eb2a818..9a1e556da 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 395aaa1e7..81114751d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fc3732b7a..9c331fd8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 93285e27e..44f3ae7bc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.8.2
+sameersbn/gitlab:14.8.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e68990c1e..f80a673cc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c96f5cdf5..03d6ea580 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2f6bb5099..37a5959d4 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.8.2
+        image: sameersbn/gitlab:14.8.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 19fbe602e72da3b4de2dedc898a3109fcad8719e Mon Sep 17 00:00:00 2001
From: Olivier Mueller <om-lists-github@omx.ch>
Date: Tue, 22 Mar 2022 20:52:03 +0100
Subject: [PATCH 0721/1124] Upgrade GitLab CE to 14.9.0 -
 https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/

---
 Changelog.md                            |  7 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 58080ee08..ea71d8bb5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.9.0**
+- gitlab: upgrade CE to v14.9.0 - https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/
+- gitaly: upgrade to v14.9.0
+- gitlab-pages: upgrade to v1.56.0
+- gitlab-shell: upgrade to v13.24.1
+- ubuntu: upgrade to focal-20220316
+
 **14.8.4**
 - gitlab: upgrade CE to v14.8.4
 - gitaly: upgrade to v14.8.4
diff --git a/Dockerfile b/Dockerfile
index 93f888584..f6012ccf9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20220113
+FROM ubuntu:focal-20220316
 
-ARG VERSION=14.8.4
+ARG VERSION=14.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.7 \
-    GITLAB_SHELL_VERSION=13.23.2 \
-    GITLAB_PAGES_VERSION=1.54.0 \
-    GITALY_SERVER_VERSION=14.8.4 \
+    GITLAB_SHELL_VERSION=13.24.1 \
+    GITLAB_PAGES_VERSION=1.56.0 \
+    GITALY_SERVER_VERSION=14.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2557a605e..60e13ba96 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.8.4
+# sameersbn/gitlab:14.9.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.4
+docker pull sameersbn/gitlab:14.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.8.4
+ sameersbn/gitlab:14.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.8.4
+    sameersbn/gitlab:14.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:sanitize
+    sameersbn/gitlab:14.9.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake db:setup
+    sameersbn/gitlab:14.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1305,7 +1305,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:env:info
+    sameersbn/gitlab:14.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.4
+docker pull sameersbn/gitlab:14.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5ccaa66f2..44a5e718d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.4
+14.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9a1e556da..f289444e1 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 81114751d..6b37776a0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c331fd8d..d554c96a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 44f3ae7bc..ea06c51f6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.4
+docker pull sameersbn/gitlab:14.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.8.4
+sameersbn/gitlab:14.9.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f80a673cc..2c026fa48 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 03d6ea580..f88eaf9c2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.4
+    image: sameersbn/gitlab:14.9.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 37a5959d4..2401ab826 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.8.4
+        image: sameersbn/gitlab:14.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 3ab737d21807f59ce470f28e79065ce59dbe39c2 Mon Sep 17 00:00:00 2001
From: Olivier Mueller <om-lists-github@omx.ch>
Date: Wed, 23 Mar 2022 13:02:14 +0100
Subject: [PATCH 0722/1124] Fix suggested by Kazunori Kimura

---
 assets/build/install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 4161b52da..a41ead05e 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -110,8 +110,7 @@ echo "Compiling gitlab-shell golang executables..."
 exec_as_git bundle config set --local deployment 'true'
 exec_as_git bundle config set --local with 'development test'
 exec_as_git bundle install -j"$(nproc)"
-exec_as_git "${GOROOT}"/bin/go mod vendor
-exec_as_git "PATH=$PATH" make fmt verify setup
+exec_as_git "PATH=$PATH" make verify setup
 
 # remove unused repositories directory created by gitlab-shell install
 rm -rf ${GITLAB_HOME}/repositories

From 16e273e88f6082074f2c044374f3b584fff722cf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 08:11:17 +0100
Subject: [PATCH 0723/1124] Upgrade GitLab CE to 14.8.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 242661029..afc49cda6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.8.3**
+- gitlab: upgrade CE to v14.8.3
+- gitaly: upgrade to v14.8.3
+- ubuntu: upgrade to focal-20220316
+
 **14.8.2**
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
diff --git a/Dockerfile b/Dockerfile
index e3f5e1130..f2398014b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20220113
+FROM ubuntu:focal-20220316
 
-ARG VERSION=14.8.2
+ARG VERSION=14.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.7 \
+    GOLANG_VERSION=1.17.8 \
     GITLAB_SHELL_VERSION=13.23.2 \
     GITLAB_PAGES_VERSION=1.54.0 \
-    GITALY_SERVER_VERSION=14.8.2 \
+    GITALY_SERVER_VERSION=14.8.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ead2ef2a6..c3cc23dd3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.8.2
+# sameersbn/gitlab:14.8.3
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.8.2
+ sameersbn/gitlab:14.8.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.8.2
+    sameersbn/gitlab:14.8.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:sanitize
+    sameersbn/gitlab:14.8.3 app:sanitize
 ```
 
 ### Piwik
@@ -1205,7 +1205,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1240,14 +1240,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake db:setup
+    sameersbn/gitlab:14.8.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1256,7 +1256,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1306,7 +1306,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.8.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1319,7 +1319,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1350,7 +1350,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.8.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1374,12 +1374,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1405,7 +1405,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.3
 ```
 
 ## Shell Access
@@ -1443,7 +1443,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9843c3ced..b4a009fc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.2
+14.8.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b7eb2a818..e07456ce2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 395aaa1e7..e35878f85 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fc3732b7a..e3089ca10 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 93285e27e..6f665424e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.8.2
+docker pull sameersbn/gitlab:14.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.8.2
+sameersbn/gitlab:14.8.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e68990c1e..4c22f789f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c96f5cdf5..a53a3752f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.8.2
+    image: sameersbn/gitlab:14.8.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2f6bb5099..d5fcaf7a9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.8.2
+        image: sameersbn/gitlab:14.8.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 28d5a2ec94f3c8b066a4c16ded408ef28c7e5941 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 09:59:51 +0100
Subject: [PATCH 0724/1124] Update Changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index afc49cda6..4ded05835 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **14.8.3**
 - gitlab: upgrade CE to v14.8.3
 - gitaly: upgrade to v14.8.3
+- golang: upgrade to v1.17.8
 - ubuntu: upgrade to focal-20220316
 
 **14.8.2**

From 918f259ef3bee9678d25755f02d00d550db84884 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 12:39:34 +0100
Subject: [PATCH 0725/1124] Remove information about base image

This base image has been changed by introducing another release.
---
 Changelog.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0000c59c4..7b8b85514 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,11 +3,10 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
 **14.9.0**
-- gitlab: upgrade CE to v14.9.0 - https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/
+- gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.56.0
 - gitlab-shell: upgrade to v13.24.1
-- ubuntu: upgrade to focal-20220316
 
 **14.8.4**
 - gitlab: upgrade CE to v14.8.4

From cedaa8e5686ebbfe387161762f2d7e3dd2cc6f89 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 20:21:18 +0100
Subject: [PATCH 0726/1124] Downgrade version of GitLab-Shell

Downgrade version of GitLab-Shell to be inline with upstream.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 507526ab5..4959ab77e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.8 \
-    GITLAB_SHELL_VERSION=13.24.1 \
+    GITLAB_SHELL_VERSION=13.24.0 \
     GITLAB_PAGES_VERSION=1.56.0 \
     GITALY_SERVER_VERSION=14.9.0 \
     GITLAB_USER="git" \

From f8b24509ee57daadf1cf6cd57d6d4ab62fd42a3d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 20:22:26 +0100
Subject: [PATCH 0727/1124] Update Changelog to account for downgrade of
 GitLab-Shell

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 7b8b85514..8343f32ef 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.56.0
-- gitlab-shell: upgrade to v13.24.1
+- gitlab-shell: upgrade to v13.24.0
 
 **14.8.4**
 - gitlab: upgrade CE to v14.8.4

From cdf54d4c314853cbf06fc8bf4df04bb2f88b7284 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Mar 2022 22:12:15 +0100
Subject: [PATCH 0728/1124] Upgrade GitLab CE to 14.9.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8343f32ef..02d26e8b9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.9.1**
+- gitlab: upgrade CE to v14.9.1
+- gitaly: upgrade to v14.9.1
+
 **14.9.0**
 - gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
diff --git a/Dockerfile b/Dockerfile
index 4959ab77e..63b4fa7b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220316
 
-ARG VERSION=14.9.0
+ARG VERSION=14.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.8 \
     GITLAB_SHELL_VERSION=13.24.0 \
     GITLAB_PAGES_VERSION=1.56.0 \
-    GITALY_SERVER_VERSION=14.9.0 \
+    GITALY_SERVER_VERSION=14.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ae084ea9e..e6a7dd79c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
 
-# sameersbn/gitlab:14.9.0
+# sameersbn/gitlab:14.9.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.0
+docker pull sameersbn/gitlab:14.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 ## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 ### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.9.0
+ sameersbn/gitlab:14.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.9.0
+    sameersbn/gitlab:14.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:sanitize
+    sameersbn/gitlab:14.9.1 app:sanitize
 ```
 
 ### Piwik
@@ -1205,7 +1205,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -1240,14 +1240,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake db:setup
+    sameersbn/gitlab:14.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -1256,7 +1256,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1306,7 +1306,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1319,7 +1319,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1350,7 +1350,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1374,12 +1374,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.0
+docker pull sameersbn/gitlab:14.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1405,7 +1405,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1
 ```
 
 ## Shell Access
@@ -1443,7 +1443,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 44a5e718d..e1bac7955 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.0
+14.9.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f289444e1..909d19a70 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6b37776a0..5b1015d57 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d554c96a9..d64f7f270 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ea06c51f6..5392409ca 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.0
+docker pull sameersbn/gitlab:14.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.9.0
+sameersbn/gitlab:14.9.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 2c026fa48..dbcce41da 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f88eaf9c2..f3acf4fbc 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.0
+    image: sameersbn/gitlab:14.9.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2401ab826..c3276b888 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.9.0
+        image: sameersbn/gitlab:14.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From e91d9b5f7cd502015cc13ac26e2ee0aa74e23800 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 5 Mar 2022 22:10:05 +0900
Subject: [PATCH 0729/1124] support GITLAB_ISSUE_CLOSING_PATTERN

---
 README.md                                 | 1 +
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ae084ea9e..a17125992 100644
--- a/README.md
+++ b/README.md
@@ -807,6 +807,7 @@ Below is the complete list of available options that can be used to customize yo
 | `GITLAB_EMAIL_SMIME_KEY_FILE` | Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``. |
 | `GITLAB_EMAIL_SMIME_CERT_FILE` | Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. |
 | `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) |
+| `GITLAB_ISSUE_CLOSING_PATTERN` | Issue closing pattern regex. See [GitLab's documentation](https://docs.gitlab.com/ee/administration/issue_closing_pattern.html) for more detail. Defaults to ` \b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ` . |
 | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
 | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
 | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. |
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index c5dd61269..8b6deb602 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -138,7 +138,7 @@ production: &base
     # This happens when the commit is pushed or merged into the default branch of a project.
     # When not specified the default issue_closing_pattern as specified below will be used.
     # Tip: you can test your closing pattern at http://rubular.com.
-    # issue_closing_pattern: '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'
+    issue_closing_pattern: '{{GITLAB_ISSUE_CLOSING_PATTERN}}'
 
     ## Default project features settings
     default_projects_features:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 661219a32..603d4bbc3 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -82,6 +82,7 @@ GITLAB_UNICORN_MEMORY_MAX=${GITLAB_UNICORN_MEMORY_MAX:-1342177280}
 ##
 GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC}
 GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-true}
+GITLAB_ISSUE_CLOSING_PATTERN=${GITLAB_ISSUE_CLOSING_PATTERN:-'\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'}
 GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100}
 GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true}
 GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index b42936df0..1124848af 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1778,7 +1778,8 @@ configure_gitlab() {
     GITLAB_PROJECTS_LIMIT \
     GITLAB_USERNAME_CHANGE \
     GITLAB_DEFAULT_THEME \
-    GITLAB_CREATE_GROUP
+    GITLAB_CREATE_GROUP \
+    GITLAB_ISSUE_CLOSING_PATTERN
 
   gitlab_configure_database
   gitlab_configure_redis

From 7a9723364c17d552dc1145eb31e97f2232a2ac32 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 5 Mar 2022 22:50:42 +0900
Subject: [PATCH 0730/1124] [skip ci] extract configuration parameter table

- extract parameter table into header and description style
- trim trailing whitespace in README (at least parameters section)
---
 README.md | 1921 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 1535 insertions(+), 386 deletions(-)

diff --git a/README.md b/README.md
index ae084ea9e..7942a4b70 100644
--- a/README.md
+++ b/README.md
@@ -785,392 +785,1541 @@ These options should contain something like:
 
 Below is the complete list of available options that can be used to customize your gitlab installation.
 
-| Parameter | Description |
-|-----------|-------------|
-| `DEBUG` | Set this to `true` to enable entrypoint debugging. |
-| `TZ` | Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam`  See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. |
-| `GITLAB_HOST` | The hostname of the GitLab server. Defaults to `localhost` |
-| `GITLAB_CI_HOST` | If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. |
-| `GITLAB_PORT` | The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. |
-| `GITLAB_SECRETS_DB_KEY_BASE` | Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. |
-| `GITLAB_SECRETS_SECRET_KEY_BASE` | Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. |
-| `GITLAB_SECRETS_OTP_KEY_BASE` |  Encryption key for OTP related stuff with  GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. |
-| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` |
-| `GITLAB_ROOT_PASSWORD` | The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. |
-| `GITLAB_ROOT_EMAIL` | The email for the root user on firstrun. Defaults to `admin@example.com` |
-| `GITLAB_EMAIL` | The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. |
-| `GITLAB_EMAIL_DISPLAY_NAME` | The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. |
-| `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. |
-| `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. |
-| `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. |
-| `GITLAB_EMAIL_SMIME_ENABLE` | Enable or disable email S/MIME signing. Defaults is `false`. |
-| `GITLAB_EMAIL_SMIME_KEY_FILE` | Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``. |
-| `GITLAB_EMAIL_SMIME_CERT_FILE` | Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. |
-| `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) |
-| `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. |
-| `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. |
-| `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. |
-| `GITLAB_IMPERSONATION_ENABLED` | Enable or disable impersonation. Defaults to `true`. |
-| `GITLAB_PROJECTS_LIMIT` | Set default projects limit. Defaults to `100`. |
-| `GITLAB_USERNAME_CHANGE` | Enable or disable ability for users to change their username. Defaults to `true`. |
-| `GITLAB_CREATE_GROUP` | Enable or disable ability for users to create groups. Defaults to `true`. |
-| `GITLAB_PROJECTS_ISSUES` | Set if *issues* feature should be enabled by default for new projects. Defaults to `true`. |
-| `GITLAB_PROJECTS_MERGE_REQUESTS` | Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`. |
-| `GITLAB_PROJECTS_WIKI` | Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`. |
-| `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. |
-| `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. |
-| `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. |
-| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. |
-| `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. |
-| `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` |
-| `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` |
-| `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` |
-| `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` |
-| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up. Defaults to `true` |
-| `GITLAB_BACKUP_DIR_GROUP` | Optionally group backups into a subfolder. Can also be used to place backups in to a subfolder on remote storage. Not used by default. |
-| `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` |
-| `GITLAB_DOWNLOADS_DIR` | The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`. |
-| `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` |
-| `GITLAB_ARTIFACTS_ENABLED` | Enable/Disable GitLab artifacts support. Defaults to `true`. |
-| `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` |
-| `AWS_ACCESS_KEY_ID`| Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`|
-| `AWS_SECRET_ACCESS_KEY`| Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`|
-| `AWS_REGION`| AWS Region. Defaults to `us-east-1` |
-| `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`|
-| `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`|
-| `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` |
-| `AWS_SIGNATURE_VERSION`| AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` |
-| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Default Google project to use for Object Store.|
-| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Default Google service account email to use for Object Store.|
-| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file Defaults to `/gcs/key.json`|
-| `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`| Default object store connection provider. Defaults to `AWS`|
-| `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
-| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'` |
-| `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. |
-| `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` |
-| `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` |
-| `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the LFS. Defaults to `lfs-object` |
-| `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
-| `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-| `GITLAB_PACKAGES_ENABLED` | Enable/Disable Pakages support. Defaults to `true`. |
-| `GITLAB_PACKAGES_DIR` | Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` |
-| `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` |
-| `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` |
-| `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false` |
-| `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
-| `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
-| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-| `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. |
-| `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` |
-| `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` | Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` |
-| `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the UPLOADS. Defaults to `uploads` |
-| `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` |
-| `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` |
-| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` |
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`|
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`|
-| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)|
-| `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. |
-| `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. |
-| `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default |
-| `GITLAB_BACKUP_EXPIRY` | Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). |
-| `GITLAB_BACKUP_PG_SCHEMA` | Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524 |
-| `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` | Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions) |
-| `GITLAB_BACKUP_TIME` | Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`. |
-| `GITLAB_BACKUP_SKIP` | Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) |
-| `GITLAB_SSH_HOST` | The ssh host. Defaults to **GITLAB_HOST**. |
-| `GITLAB_SSH_LISTEN_PORT` | The ssh port for SSHD to listen on. Defaults to `22` |
-| `GITLAB_SSH_MAXSTARTUPS` | The ssh "MaxStartups" parameter, defaults to `10:30:60`. |
-| `GITLAB_SSH_PORT` | The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. |
-| `GITLAB_RELATIVE_URL_ROOT` | The relative url of the GitLab server, e.g. `/git`. No default. |
-| `GITLAB_TRUSTED_PROXIES` | Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. |
-| `GITLAB_REGISTRY_ENABLED` | Enables the GitLab Container Registry. Defaults to `false`. |
-| `GITLAB_REGISTRY_HOST` | Sets the GitLab Registry Host. Defaults to `registry.example.com` |
-| `GITLAB_REGISTRY_PORT` | Sets the GitLab Registry Port. Defaults to `443`. |
-| `GITLAB_REGISTRY_API_URL` | Sets the GitLab Registry API URL. Defaults to `http://localhost:5000` |
-| `GITLAB_REGISTRY_KEY_PATH` | Sets the GitLab Registry Key Path. Defaults to `config/registry.key` |
-| `GITLAB_REGISTRY_DIR` | Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` |
-| `GITLAB_REGISTRY_ISSUER` | Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. |
-| `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` | Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt` |
-| `GITLAB_PAGES_ENABLED` | Enables the GitLab Pages. Defaults to `false`. |
-| `GITLAB_PAGES_DOMAIN` | Sets the GitLab Pages Domain. Defaults to `example.com` |
-| `GITLAB_PAGES_DIR` | Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` |
-| `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` |
-| `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` |
-| `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. |
-| `GITLAB_PAGES_ARTIFACTS_SERVER_URL` | If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No default. |
-| `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default |
-| `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default |
-| `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. |
-| `GITLAB_PAGES_NGINX_PROXY` | Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup. |
-| `GITLAB_PAGES_ACCESS_SECRET` | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. |
-| `GITLAB_PAGES_ACCESS_CONTROL_SERVER` | Gitlab instance URI, example: `https://gitlab.example.io` |
-| `GITLAB_PAGES_ACCESS_CLIENT_ID` | Client ID from earlier generated OAuth application |
-| `GITLAB_PAGES_ACCESS_CLIENT_SECRET` | Client Secret from earlier genereated OAuth application |
-| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth` |
-| `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. |
-| `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` |
-| `GITALY_TOKEN` | Set a gitaly token, blank by default. |
-| `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` | Time between sampling of unicorn socket metrics, in seconds, defaults to `10` |
-| `GITLAB_MONITORING_IP_WHITELIST` | IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` |
-| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` | Set to `true` to enable the sidekiq exporter, enabled by default. |
-| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` | Sidekiq exporter address, defaults to `0.0.0.0` |
-| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` | Sidekiq exporter port, defaults to `3807` |
-| `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` | Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. |
-| `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` | Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` | The value of the `base-uri` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` | The value of the `child-src` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` | The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` | The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` | The value of the `font-src` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` | The value of the `form-action` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` | The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` | The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` | The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` | The value of the `manifest-src` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` | The value of the `media-src` directive in the `Content-Security-Policy` header |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` | The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'`  |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` | The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` | The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` | The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` |
-| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` | The value of the `report-uri` directive in the `Content-Security-Policy` header |
-| `SSL_SELF_SIGNED` | Set to `true` when using self signed ssl certificates. `false` by default. |
-| `SSL_CERTIFICATE_PATH` | Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` |
-| `SSL_KEY_PATH` | Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` |
-| `SSL_DHPARAM_PATH` | Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem` |
-| `SSL_VERIFY_CLIENT` | Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off` |
-| `SSL_CA_CERTIFICATES_PATH` | List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. |
-| `SSL_REGISTRY_KEY_PATH` | Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key` |
-| `SSL_REGISTRY_CERT_PATH` | Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt` |
-| `SSL_PAGES_KEY_PATH` | Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` |
-| `SSL_PAGES_CERT_PATH` | Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` |
-| `SSL_CIPHERS` | List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` |
-| `SSL_PROTOCOLS` | List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` |
-| `SSL_PAGES_CIPHERS` | List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` |
-| `SSL_PAGES_PROTOCOLS` | List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` |
-| `SSL_REGISTRY_CIPHERS` | List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` |
-| `SSL_REGISTRY_PROTOCOLS` | List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` |
-| `NGINX_WORKERS` | The number of nginx workers to start. Defaults to `1`. |
-| `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` | Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. |
-| `NGINX_HSTS_ENABLED` | Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. |
-| `NGINX_HSTS_MAXAGE` | Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`. |
-| `NGINX_PROXY_BUFFERING` | Enable `proxy_buffering`. Defaults to `off`. |
-| `NGINX_ACCEL_BUFFERING` | Enable `X-Accel-Buffering` header. Default to `no` |
-| `NGINX_X_FORWARDED_PROTO` | Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. |
-| `NGINX_REAL_IP_RECURSIVE` | set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. |
-| `NGINX_REAL_IP_TRUSTED_ADDRESSES` | You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. |
-| `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` | Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. |
-| `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` |
-| `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. |
-| `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. |
-| `PUMA_WORKERS` | The number of puma workers to start. Defaults to `3`. |
-| `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. |
-| `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. |
-| `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. |
-| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. |
-| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. |
-| `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
-| `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
-| `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
-| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `json` |
-| `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
-| `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
-| `DB_HOST` | The database server hostname. Defaults to `localhost`. |
-| `DB_PORT` | The database server port. Defaults to `5432` for postgresql. |
-| `DB_NAME` | The database database name. Defaults to `gitlabhq_production` |
-| `DB_USER` | The database database user. Defaults to `root` |
-| `DB_PASS` | The database database password. Defaults to no password |
-| `DB_POOL` | The database database connection pool count. Defaults to `10`. |
-| `DB_PREPARED_STATEMENTS` | Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) |
-| `SMTP_ENABLED` | Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`. |
-| `SMTP_DOMAIN` | SMTP domain. Defaults to` www.gmail.com` |
-| `SMTP_HOST` | SMTP server host. Defaults to `smtp.gmail.com`. |
-| `SMTP_PORT` | SMTP server port. Defaults to `587`. |
-| `SMTP_USER` | SMTP username. |
-| `SMTP_PASS` | SMTP password. |
-| `SMTP_STARTTLS` | Enable STARTTLS. Defaults to `true`. |
-| `SMTP_TLS` | Enable SSL/TLS. Defaults to `false`. |
-| `SMTP_OPENSSL_VERIFY_MODE` | SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`. |
-| `SMTP_AUTHENTICATION` | Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set. |
-| `SMTP_CA_ENABLED` | Enable custom CA certificates for SMTP email configuration. Defaults to `false`. |
-| `SMTP_CA_PATH` | Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`. |
-| `SMTP_CA_FILE` | Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`. |
-| `IMAP_ENABLED` | Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`. |
-| `IMAP_HOST` | IMAP server host. Defaults to `imap.gmail.com`. |
-| `IMAP_PORT` | IMAP server port. Defaults to `993`. |
-| `IMAP_USER` | IMAP username. |
-| `IMAP_PASS` | IMAP password. |
-| `IMAP_SSL` | Enable SSL. Defaults to `true`. |
-| `IMAP_STARTTLS` | Enable STARTSSL. Defaults to `false`. |
-| `IMAP_MAILBOX` | The name of the mailbox where incoming mail will end up. Defaults to `inbox`. |
-| `LDAP_ENABLED` | Enable LDAP. Defaults to `false` |
-| `LDAP_LABEL` | Label to show on login tab for LDAP server. Defaults to 'LDAP' |
-| `LDAP_HOST` | LDAP Host |
-| `LDAP_PORT` | LDAP Port. Defaults to `389` |
-| `LDAP_UID` | LDAP UID. Defaults to `sAMAccountName` |
-| `LDAP_METHOD` | LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain` |
-| `LDAP_VERIFY_SSL` | LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true` |
-| `LDAP_CA_FILE` | Specifies the path to a file containing a PEM-format CA certificate. Defaults to `` |
-| `LDAP_SSL_VERSION` | Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to `` |
-| `LDAP_BIND_DN` | No default. |
-| `LDAP_PASS` | LDAP password |
-| `LDAP_TIMEOUT` | Timeout, in seconds, for LDAP queries. Defaults to `10`. |
-| `LDAP_ACTIVE_DIRECTORY` | Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`, |
-| `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN` | If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`. |
-| `LDAP_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `false`. |
-| `LDAP_BASE` | Base where we can search for users. No default. |
-| `LDAP_USER_FILTER` | Filter LDAP users. No default. |
-| `LDAP_USER_ATTRIBUTE_USERNAME` | Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']` |
-| `LDAP_USER_ATTRIBUTE_MAIL` | Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']` |
-| `LDAP_USER_ATTRIBUTE_NAME` | Attribute field for the used username of a user. Default to `cn`. |
-| `LDAP_USER_ATTRIBUTE_FIRSTNAME` | Attribute field for the forename of a user. Default to `givenName` |
-| `LDAP_USER_ATTRIBUTE_LASTNAME` |  Attribute field for the surname of a user. Default to `sn` |
-| `LDAP_LOWERCASE_USERNAMES` | GitLab will lower case the username for the LDAP Server. Defaults to `false` |
-| `LDAP_PREVENT_LDAP_SIGN_IN` | Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), defaults to `false` |
-| `OAUTH_ENABLED` | Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`. |
-| `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` | Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
-| `OAUTH_ALLOW_SSO` | Comma separated list of oauth providers for single sign-on. This allows users to login without having a user account. The account is created automatically when authentication is successful. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
-| `OAUTH_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `true`. |
-| `OAUTH_AUTO_LINK_LDAP_USER` | Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. |
-| `OAUTH_AUTO_LINK_SAML_USER` | Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. |
-| `OAUTH_AUTO_LINK_USER` | Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. |
-| `OAUTH_EXTERNAL_PROVIDERS` | Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. |
-| `OAUTH_CAS3_LABEL` | The "Sign in with" button label. Defaults to "cas3". |
-| `OAUTH_CAS3_SERVER` | CAS3 server URL. No defaults. |
-| `OAUTH_CAS3_DISABLE_SSL_VERIFICATION` | Disable CAS3 SSL verification. Defaults to `false`. |
-| `OAUTH_CAS3_LOGIN_URL` | CAS3 login URL. Defaults to `/cas/login` |
-| `OAUTH_CAS3_VALIDATE_URL` | CAS3 validation URL. Defaults to `/cas/p3/serviceValidate` |
-| `OAUTH_CAS3_LOGOUT_URL` | CAS3 logout URL. Defaults to `/cas/logout` |
-| `OAUTH_GOOGLE_API_KEY` | Google App Client ID. No defaults. |
-| `OAUTH_GOOGLE_APP_SECRET` | Google App Client Secret. No defaults. |
-| `OAUTH_GOOGLE_RESTRICT_DOMAIN` | List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults. |
-| `OAUTH_FACEBOOK_API_KEY` | Facebook App API key. No defaults. |
-| `OAUTH_FACEBOOK_APP_SECRET` | Facebook App API secret. No defaults. |
-| `OAUTH_TWITTER_API_KEY` | Twitter App API key. No defaults. |
-| `OAUTH_TWITTER_APP_SECRET` | Twitter App API secret. No defaults. |
-| `OAUTH_AUTHENTIQ_CLIENT_ID` | authentiq Client ID. No defaults. |
-| `OAUTH_AUTHENTIQ_CLIENT_SECRET` | authentiq Client secret. No defaults. |
-| `OAUTH_AUTHENTIQ_SCOPE` | Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'`|
-| `OAUTH_AUTHENTIQ_REDIRECT_URI` |  Callback URL for Authentiq. No defaults. |
-| `OAUTH_GITHUB_API_KEY` | GitHub App Client ID. No defaults. |
-| `OAUTH_GITHUB_APP_SECRET` | GitHub App Client secret. No defaults. |
-| `OAUTH_GITHUB_URL` | Url to the GitHub Enterprise server. Defaults to https://github.com |
-| `OAUTH_GITHUB_VERIFY_SSL` | Enable SSL verification while communicating with the GitHub server. Defaults to `true`. |
-| `OAUTH_GITLAB_API_KEY` | GitLab App Client ID. No defaults. |
-| `OAUTH_GITLAB_APP_SECRET` | GitLab App Client secret. No defaults. |
-| `OAUTH_BITBUCKET_API_KEY` | BitBucket App Client ID. No defaults. |
-| `OAUTH_BITBUCKET_APP_SECRET` | BitBucket App Client secret. No defaults. |
-| `OAUTH_BITBUCKET_URL` | Bitbucket URL. Defaults: https://bitbucket.org/ |
-| `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` | The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. |
-| `OAUTH_SAML_IDP_CERT_FINGERPRINT` | The SHA1 fingerprint of the certificate. No Defaults. |
-| `OAUTH_SAML_IDP_SSO_TARGET_URL` | The URL to which the authentication request should be sent. No defaults. |
-| `OAUTH_SAML_ISSUER` | The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`. |
-| `OAUTH_SAML_LABEL` | The "Sign in with" button label. Defaults to "Our SAML Provider". |
-| `OAUTH_SAML_NAME_IDENTIFIER_FORMAT` | Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` |
-| `OAUTH_SAML_GROUPS_ATTRIBUTE` | Map groups attribute in a SAMLResponse to external groups. No defaults. |
-| `OAUTH_SAML_EXTERNAL_GROUPS` | List of external groups in a SAMLResponse. Value is comma separated list of single quoted groups. Example: `'group1','group2'`. No defaults. |
-| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL` | Map 'email' attribute name in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
-| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME` | Map 'username' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
-| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME` | Map 'name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
-| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME` | Map 'first_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
-| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME` | Map 'last_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. |
-| `OAUTH_CROWD_SERVER_URL` | Crowd server url. No defaults. |
-| `OAUTH_CROWD_APP_NAME` | Crowd server application name. No defaults. |
-| `OAUTH_CROWD_APP_PASSWORD` | Crowd server application password. No defaults. |
-| `OAUTH_AUTH0_CLIENT_ID` | Auth0 Client ID. No defaults. |
-| `OAUTH_AUTH0_CLIENT_SECRET` | Auth0 Client secret. No defaults. |
-| `OAUTH_AUTH0_DOMAIN` | Auth0 Domain. No defaults. |
-| `OAUTH_AUTH0_SCOPE` | Auth0 Scope. Defaults to `openid profile email`. |
-| `OAUTH_AZURE_API_KEY` | Azure Client ID. No defaults. |
-| `OAUTH_AZURE_API_SECRET` | Azure Client secret. No defaults. |
-| `OAUTH_AZURE_TENANT_ID` | Azure Tenant ID. No defaults. |
-| `OAUTH2_GENERIC_APP_ID` | Your OAuth2 App ID. No defaults. |
-| `OAUTH2_GENERIC_APP_SECRET` | Your OAuth2 App Secret. No defaults. |
-| `OAUTH2_GENERIC_CLIENT_SITE` | The OAuth2 generic client site. No defaults |
-| `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` | The OAuth2 generic client user info url. No defaults |
-| `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` | The OAuth2 generic client authorize url. No defaults |
-| `OAUTH2_GENERIC_CLIENT_TOKEN_URL` | The OAuth2 generic client token url. No defaults|
-| `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` | The OAuth2 generic client end session endpoint. No defaults |
-| `OAUTH2_GENERIC_ID_PATH` | The OAuth2 generic id path. No defaults |
-| `OAUTH2_GENERIC_USER_UID` | The OAuth2 generic user id path. No defaults |
-| `OAUTH2_GENERIC_USER_NAME` | The OAuth2 generic user name. No defaults |
-| `OAUTH2_GENERIC_USER_EMAIL` | The OAuth2 generic user email. No defaults |
-| `OAUTH2_GENERIC_NAME` | The name of your OAuth2 provider. No defaults |
-| `GITLAB_GRAVATAR_ENABLED` | Enables gravatar integration. Defaults to `true`. |
-| `GITLAB_GRAVATAR_HTTP_URL` | Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html). |
-| `GITLAB_GRAVATAR_HTTPS_URL` | Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. |
-| `USERMAP_UID` | Sets the uid for user `git` to the specified uid. Defaults to `1000`. |
-| `USERMAP_GID` | Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`. |
-| `GOOGLE_ANALYTICS_ID` | Google Analytics ID. No defaults. |
-| `PIWIK_URL` | Sets the Piwik URL. No defaults. |
-| `PIWIK_SITE_ID` | Sets the Piwik site ID. No defaults. |
-| `AWS_BACKUPS` | Enables automatic uploads to an Amazon S3 instance. Defaults to `false`. |
-| `AWS_BACKUP_REGION` | AWS region. No defaults. |
-| `AWS_BACKUP_ENDPOINT` | AWS endpoint. No defaults. |
-| `AWS_BACKUP_ACCESS_KEY_ID` | AWS access key id. No defaults. |
-| `AWS_BACKUP_SECRET_ACCESS_KEY` | AWS secret access key. No defaults. |
-| `AWS_BACKUP_BUCKET` | AWS bucket for backup uploads. No defaults. |
-| `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) |
-| `AWS_BACKUP_ENCRYPTION`     | Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) |
-| `AWS_BACKUP_STORAGE_CLASS` | Configure the storage class for the item. Defaults to `STANDARD`  See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html) |
-| `AWS_BACKUP_SIGNATURE_VERSION` | Configure the storage signature version. Defaults to `4`  See at [AWS S3 Docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version) |
-| `GCS_BACKUPS` | Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`.  |
-| `GCS_BACKUP_ACCESS_KEY_ID` | GCS access key id. No defaults |
-| `GCS_BACKUP_SECRET_ACCESS_KEY` | GCS secret access key. No defaults |
-| `GCS_BACKUP_BUCKET` | GCS bucket for backup uploads. No defaults |
-| `GITLAB_ROBOTS_PATH` | Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples. |
-| `RACK_ATTACK_ENABLED` | Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`. |
-| `RACK_ATTACK_WHITELIST` | Always allow requests from whitelisted host. Defaults to `127.0.0.1` |
-| `RACK_ATTACK_MAXRETRY` | Number of failed auth attempts before which an IP should be banned. Defaults to `10` |
-| `RACK_ATTACK_FINDTIME` | Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`. |
-| `RACK_ATTACK_BANTIME` | Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`. |
-| `GITLAB_WORKHORSE_TIMEOUT` | Timeout for gitlab workhorse http proxy. Defaults to `5m0s`. |
-| `SENTRY_ENABLED` | Enables Error Reporting and Logging with Sentry. Defaults to `false`. |
-| `SENTRY_DSN` | Sentry DSN. No defaults. |
-| `SENTRY_CLIENTSIDE_DSN` | Sentry clientside DSN. No defaults. |
-| `SENTRY_ENVIRONMENT` | Sentry environment. Defaults to `production`. |
+#### `DEBUG`
+
+Set this to `true` to enable entrypoint debugging.
+
+#### `TZ`
+
+Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam`  See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`.
+
+#### `GITLAB_HOST`
+
+The hostname of the GitLab server. Defaults to `localhost`
+
+#### `GITLAB_CI_HOST`
+
+If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults.
+
+#### `GITLAB_PORT`
+
+The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`.
+
+#### `GITLAB_SECRETS_DB_KEY_BASE`
+
+Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults.
+
+#### `GITLAB_SECRETS_SECRET_KEY_BASE`
+
+Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults.
+
+#### `GITLAB_SECRETS_OTP_KEY_BASE`
+
+ Encryption key for OTP related stuff with  GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults.
+
+#### `GITLAB_TIMEZONE`
+
+Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ`
+
+#### `GITLAB_ROOT_PASSWORD`
+
+The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**.
+
+#### `GITLAB_ROOT_EMAIL`
+
+The email for the root user on firstrun. Defaults to `admin@example.com`
+
+#### `GITLAB_EMAIL`
+
+The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`.
+
+#### `GITLAB_EMAIL_DISPLAY_NAME`
+
+The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`.
+
+#### `GITLAB_EMAIL_REPLY_TO`
+
+The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`.
+
+#### `GITLAB_EMAIL_SUBJECT_SUFFIX`
+
+The e-mail subject suffix used in e-mails sent by GitLab. No defaults.
+
+#### `GITLAB_EMAIL_ENABLED`
+
+Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration.
+
+#### `GITLAB_EMAIL_SMIME_ENABLE`
+
+Enable or disable email S/MIME signing. Defaults is `false`.
+
+#### `GITLAB_EMAIL_SMIME_KEY_FILE`
+
+Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``.
+
+#### `GITLAB_EMAIL_SMIME_CERT_FILE`
+
+Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``.
+
+#### `GITLAB_DEFAULT_THEME`
+
+Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red)
+
+#### `GITLAB_INCOMING_EMAIL_ADDRESS`
+
+The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter.
+
+#### `GITLAB_INCOMING_EMAIL_ENABLED`
+
+Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`.
+
+#### `GITLAB_SIGNUP_ENABLED`
+
+Enable or disable user signups (first run only). Default is `true`.
+
+#### `GITLAB_IMPERSONATION_ENABLED`
+
+Enable or disable impersonation. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_LIMIT`
+
+Set default projects limit. Defaults to `100`.
+
+#### `GITLAB_USERNAME_CHANGE`
+
+Enable or disable ability for users to change their username. Defaults to `true`.
+
+#### `GITLAB_CREATE_GROUP`
+
+Enable or disable ability for users to create groups. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_ISSUES`
+
+Set if *issues* feature should be enabled by default for new projects. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_MERGE_REQUESTS`
+
+Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_WIKI`
+
+Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_SNIPPETS`
+
+Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`.
+
+#### `GITLAB_PROJECTS_BUILDS`
+
+Set if *builds* feature should be enabled by default for new projects. Defaults to `true`.
+
+#### `GITLAB_PROJECTS_CONTAINER_REGISTRY`
+
+Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`.
+
+#### `GITLAB_SHELL_CUSTOM_HOOKS_DIR`
+
+Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`.
+
+#### `GITLAB_WEBHOOK_TIMEOUT`
+
+Sets the timeout for webhooks. Defaults to `10` seconds.
+
+#### `GITLAB_NOTIFY_ON_BROKEN_BUILDS`
+
+Enable or disable broken build notification emails. Defaults to `true`
+
+#### `GITLAB_NOTIFY_PUSHER`
+
+Add pusher to recipients list of broken build notification emails. Defaults to `false`
+
+#### `GITLAB_REPOS_DIR`
+
+The git repositories folder in the container. Defaults to `/home/git/data/repositories`
+
+#### `GITLAB_BACKUP_DIR`
+
+The backup folder in the container. Defaults to `/home/git/data/backups`
+
+#### `GITLAB_BACKUP_DIR_CHOWN`
+
+Optionally change ownership of backup files on start-up. Defaults to `true`
+
+#### `GITLAB_BACKUP_DIR_GROUP`
+
+Optionally group backups into a subfolder. Can also be used to place backups in to a subfolder on remote storage. Not used by default.
+
+#### `GITLAB_BUILDS_DIR`
+
+The build traces directory. Defaults to `/home/git/data/builds`
+
+#### `GITLAB_DOWNLOADS_DIR`
+
+The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`.
+
+#### `GITLAB_SHARED_DIR`
+
+The directory to store the build artifacts. Defaults to `/home/git/data/shared`
+
+#### `GITLAB_ARTIFACTS_ENABLED`
+
+Enable/Disable GitLab artifacts support. Defaults to `true`.
+
+#### `GITLAB_ARTIFACTS_DIR`
+
+Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts`
+
+#### `AWS_ACCESS_KEY_ID`
+
+Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`
+
+#### `AWS_SECRET_ACCESS_KEY`
+
+Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`
+
+#### `AWS_REGION`
+
+AWS Region. Defaults to `us-east-1`
+
+#### `AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`
+
+#### `AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`
+
+#### `AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true`
+
+#### `AWS_SIGNATURE_VERSION`
+
+AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4`
+
+#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Default Google project to use for Object Store.
+
+#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Default Google service account email to use for Object Store.
+
+#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file Defaults to `/gcs/key.json`
+
+#### `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Default object store connection provider. Defaults to `AWS`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED`
+
+Enables Object Store for Artifacts that will be remote stored. Defaults to `false`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY`
+
+Bucket name to store the artifacts. Defaults to `artifacts`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD`
+
+Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD`
+
+Temporary option to limit automatic upload. Defaults to `false`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD`
+
+Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+
+AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+
+AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION`
+
+AWS Region. Defaults to `$AWS_REGION`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
+
+AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
+
+#### `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON`
+
+Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'`
+
+#### `GITLAB_LFS_ENABLED`
+
+Enable/Disable Git LFS support. Defaults to `true`.
+
+#### `GITLAB_LFS_OBJECTS_DIR`
+
+Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects`
+
+#### `GITLAB_LFS_OBJECT_STORE_ENABLED`
+
+Enables Object Store for LFS that will be remote stored. Defaults to `false`
+
+#### `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY`
+
+Bucket name to store the LFS. Defaults to `lfs-object`
+
+#### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD`
+
+Temporary option to limit automatic upload. Defaults to `false`
+
+#### `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD`
+
+Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+
+AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+
+AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION`
+
+AWS Region. Defaults to `$AWS_REGION`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
+
+AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
+
+#### `GITLAB_PACKAGES_ENABLED`
+
+Enable/Disable Pakages support. Defaults to `true`.
+
+#### `GITLAB_PACKAGES_DIR`
+
+Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED`
+
+Enables Object Store for Packages that will be remote stored. Defaults to `false`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY`
+
+Bucket name to store the packages. Defaults to `packages`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD`
+
+Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD`
+
+Temporary option to limit automatic upload. Defaults to `false`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD`
+
+Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+
+AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+
+AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION`
+
+AWS Region. Defaults to `$AWS_REGION`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
+
+#### `GITLAB_UPLOADS_STORAGE_PATH`
+
+The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`.
+
+#### `GITLAB_UPLOADS_BASE_DIR`
+
+Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_ENABLED`
+
+Enables Object Store for UPLOADS that will be remote stored. Defaults to `false`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY`
+
+Bucket name to store the UPLOADS. Defaults to `uploads`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD`
+
+Temporary option to limit automatic upload. Defaults to `false`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD`
+
+Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+
+AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+
+AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION`
+
+AWS Region. Defaults to `$AWS_REGION`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
+
+#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
+
+AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
+
+#### `GITLAB_MATTERMOST_ENABLED`
+
+Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`.
+
+#### `GITLAB_MATTERMOST_URL`
+
+Sets Mattermost URL. Defaults to `https://mattermost.example.com`.
+
+#### `GITLAB_BACKUP_SCHEDULE`
+
+Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default
+
+#### `GITLAB_BACKUP_EXPIRY`
+
+Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds).
+
+#### `GITLAB_BACKUP_PG_SCHEMA`
+
+Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524
+
+#### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS`
+
+Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions)
+
+#### `GITLAB_BACKUP_TIME`
+
+Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`.
+
+#### `GITLAB_BACKUP_SKIP`
+
+Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system)
+
+#### `GITLAB_SSH_HOST`
+
+The ssh host. Defaults to **GITLAB_HOST**.
+
+#### `GITLAB_SSH_LISTEN_PORT`
+
+The ssh port for SSHD to listen on. Defaults to `22`
+
+#### `GITLAB_SSH_MAXSTARTUPS`
+
+The ssh "MaxStartups" parameter, defaults to `10:30:60`.
+
+#### `GITLAB_SSH_PORT`
+
+The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`.
+
+#### `GITLAB_RELATIVE_URL_ROOT`
+
+The relative url of the GitLab server, e.g. `/git`. No default.
+
+#### `GITLAB_TRUSTED_PROXIES`
+
+Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults.
+
+#### `GITLAB_REGISTRY_ENABLED`
+
+Enables the GitLab Container Registry. Defaults to `false`.
+
+#### `GITLAB_REGISTRY_HOST`
+
+Sets the GitLab Registry Host. Defaults to `registry.example.com`
+
+#### `GITLAB_REGISTRY_PORT`
+
+Sets the GitLab Registry Port. Defaults to `443`.
+
+#### `GITLAB_REGISTRY_API_URL`
+
+Sets the GitLab Registry API URL. Defaults to `http://localhost:5000`
+
+#### `GITLAB_REGISTRY_KEY_PATH`
+
+Sets the GitLab Registry Key Path. Defaults to `config/registry.key`
+
+#### `GITLAB_REGISTRY_DIR`
+
+Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry`
+
+#### `GITLAB_REGISTRY_ISSUER`
+
+Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`.
+
+#### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES`
+
+Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt`
+
+#### `GITLAB_PAGES_ENABLED`
+
+Enables the GitLab Pages. Defaults to `false`.
+
+#### `GITLAB_PAGES_DOMAIN`
+
+Sets the GitLab Pages Domain. Defaults to `example.com`
+
+#### `GITLAB_PAGES_DIR`
+
+Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages`
+
+#### `GITLAB_PAGES_PORT`
+
+Sets GitLab Pages Port that will be used in NGINX. Defaults to `80`
+
+#### `GITLAB_PAGES_HTTPS`
+
+Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false`
+
+#### `GITLAB_PAGES_ARTIFACTS_SERVER`
+
+Set to `true` to enable pages artifactsserver, enabled by default.
+
+#### `GITLAB_PAGES_ARTIFACTS_SERVER_URL`
+
+If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No default.
+
+#### `GITLAB_PAGES_EXTERNAL_HTTP`
+
+Sets GitLab Pages external http to receive request on an independen port. Disabled by default
+
+#### `GITLAB_PAGES_EXTERNAL_HTTPS`
+
+Sets GitLab Pages external https to receive request on an independen port. Disabled by default
+
+#### `GITLAB_PAGES_ACCESS_CONTROL`
+
+Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default.
+
+#### `GITLAB_PAGES_NGINX_PROXY`
+
+Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup.
+
+#### `GITLAB_PAGES_ACCESS_SECRET`
+
+Secret Hash, minimal 32 characters, if omitted, it will be auto generated.
+
+#### `GITLAB_PAGES_ACCESS_CONTROL_SERVER`
+
+Gitlab instance URI, example: `https://gitlab.example.io`
+
+#### `GITLAB_PAGES_ACCESS_CLIENT_ID`
+
+Client ID from earlier generated OAuth application
+
+#### `GITLAB_PAGES_ACCESS_CLIENT_SECRET`
+
+Client Secret from earlier genereated OAuth application
+
+#### `GITLAB_PAGES_ACCESS_REDIRECT_URI`
+
+Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth`
+
+#### `GITLAB_HTTPS`
+
+Set to `true` to enable https support, disabled by default.
+
+#### `GITALY_CLIENT_PATH`
+
+Set default path for gitaly. defaults to `/home/git/gitaly`
+
+#### `GITALY_TOKEN`
+
+Set a gitaly token, blank by default.
+
+#### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL`
+
+Time between sampling of unicorn socket metrics, in seconds, defaults to `10`
+
+#### `GITLAB_MONITORING_IP_WHITELIST`
+
+IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8`
+
+#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED`
+
+Set to `true` to enable the sidekiq exporter, enabled by default.
+
+#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS`
+
+Sidekiq exporter address, defaults to `0.0.0.0`
+
+#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT`
+
+Sidekiq exporter port, defaults to `3807`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED`
+
+Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default.
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY`
+
+Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI`
+
+The value of the `base-uri` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC`
+
+The value of the `child-src` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC`
+
+The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC`
+
+The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC`
+
+The value of the `font-src` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION`
+
+The value of the `form-action` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS`
+
+The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC`
+
+The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC`
+
+The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC`
+
+The value of the `manifest-src` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC`
+
+The value of the `media-src` directive in the `Content-Security-Policy` header
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC`
+
+The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC`
+
+The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC`
+
+The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC`
+
+The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:`
+
+#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI`
+
+The value of the `report-uri` directive in the `Content-Security-Policy` header
+
+#### `SSL_SELF_SIGNED`
+
+Set to `true` when using self signed ssl certificates. `false` by default.
+
+#### `SSL_CERTIFICATE_PATH`
+
+Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt`
+
+#### `SSL_KEY_PATH`
+
+Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key`
+
+#### `SSL_DHPARAM_PATH`
+
+Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem`
+
+#### `SSL_VERIFY_CLIENT`
+
+Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off`
+
+#### `SSL_CA_CERTIFICATES_PATH`
+
+List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`.
+
+#### `SSL_REGISTRY_KEY_PATH`
+
+Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key`
+
+#### `SSL_REGISTRY_CERT_PATH`
+
+Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt`
+
+#### `SSL_PAGES_KEY_PATH`
+
+Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key`
+
+#### `SSL_PAGES_CERT_PATH`
+
+Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt`
+
+#### `SSL_CIPHERS`
+
+List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4`
+
+#### `SSL_PROTOCOLS`
+
+List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3`
+
+#### `SSL_PAGES_CIPHERS`
+
+List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS`
+
+#### `SSL_PAGES_PROTOCOLS`
+
+List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS`
+
+#### `SSL_REGISTRY_CIPHERS`
+
+List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS`
+
+#### `SSL_REGISTRY_PROTOCOLS`
+
+List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS`
+
+#### `NGINX_WORKERS`
+
+The number of nginx workers to start. Defaults to `1`.
+
+#### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE`
+
+Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`.
+
+#### `NGINX_HSTS_ENABLED`
+
+Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario.
+
+#### `NGINX_HSTS_MAXAGE`
+
+Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`.
+
+#### `NGINX_PROXY_BUFFERING`
+
+Enable `proxy_buffering`. Defaults to `off`.
+
+#### `NGINX_ACCEL_BUFFERING`
+
+Enable `X-Accel-Buffering` header. Default to `no`
+
+#### `NGINX_X_FORWARDED_PROTO`
+
+Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`.
+
+#### `NGINX_REAL_IP_RECURSIVE`
+
+set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default.
+
+#### `NGINX_REAL_IP_TRUSTED_ADDRESSES`
+
+You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults.
+
+#### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG`
+
+Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults.
+
+#### `REDIS_HOST`
+
+The hostname of the redis server. Defaults to `localhost`
+
+#### `REDIS_PORT`
+
+The connection port of the redis server. Defaults to `6379`.
+
+#### `REDIS_DB_NUMBER`
+
+The redis database number. Defaults to '0'.
+
+#### `PUMA_WORKERS`
+
+The number of puma workers to start. Defaults to `3`.
+
+#### `PUMA_TIMEOUT`
+
+Sets the timeout of puma worker processes. Defaults to `60` seconds.
+
+#### `PUMA_THREADS_MIN`
+
+The number of puma minimum threads. Defaults to `1`.
+
+#### `PUMA_THREADS_MAX`
+
+The number of puma maximum threads. Defaults to `16`.
+
+#### `PUMA_PER_WORKER_MAX_MEMORY_MB`
+
+Maximum memory size of per puma worker process. Defaults to `1024`.
+
+#### `PUMA_MASTER_MAX_MEMORY_MB`
+
+Maximum memory size of puma master process. Defaults to `800`.
+
+#### `SIDEKIQ_CONCURRENCY`
+
+The number of concurrent sidekiq jobs to run. Defaults to `25`
+
+#### `SIDEKIQ_SHUTDOWN_TIMEOUT`
+
+Timeout for sidekiq shutdown. Defaults to `4`
+
+#### `SIDEKIQ_MEMORY_KILLER_MAX_RSS`
+
+Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
+
+#### `GITLAB_SIDEKIQ_LOG_FORMAT`
+
+Sidekiq log format that will be used. Defaults to `json`
+
+#### `DB_ADAPTER`
+
+The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`.
+
+#### `DB_ENCODING`
+
+The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively.
+
+#### `DB_HOST`
+
+The database server hostname. Defaults to `localhost`.
+
+#### `DB_PORT`
+
+The database server port. Defaults to `5432` for postgresql.
+
+#### `DB_NAME`
+
+The database database name. Defaults to `gitlabhq_production`
+
+#### `DB_USER`
+
+The database database user. Defaults to `root`
+
+#### `DB_PASS`
+
+The database database password. Defaults to no password
+
+#### `DB_POOL`
+
+The database database connection pool count. Defaults to `10`.
+
+#### `DB_PREPARED_STATEMENTS`
+
+Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/)
+
+#### `SMTP_ENABLED`
+
+Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`.
+
+#### `SMTP_DOMAIN`
+
+SMTP domain. Defaults to` www.gmail.com`
+
+#### `SMTP_HOST`
+
+SMTP server host. Defaults to `smtp.gmail.com`.
+
+#### `SMTP_PORT`
+
+SMTP server port. Defaults to `587`.
+
+#### `SMTP_USER`
+
+SMTP username.
+
+#### `SMTP_PASS`
+
+SMTP password.
+
+#### `SMTP_STARTTLS`
+
+Enable STARTTLS. Defaults to `true`.
+
+#### `SMTP_TLS`
+
+Enable SSL/TLS. Defaults to `false`.
+
+#### `SMTP_OPENSSL_VERIFY_MODE`
+
+SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`.
+
+#### `SMTP_AUTHENTICATION`
+
+Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set.
+
+#### `SMTP_CA_ENABLED`
+
+Enable custom CA certificates for SMTP email configuration. Defaults to `false`.
+
+#### `SMTP_CA_PATH`
+
+Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`.
+
+#### `SMTP_CA_FILE`
+
+Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`.
+
+#### `IMAP_ENABLED`
+
+Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`.
+
+#### `IMAP_HOST`
+
+IMAP server host. Defaults to `imap.gmail.com`.
+
+#### `IMAP_PORT`
+
+IMAP server port. Defaults to `993`.
+
+#### `IMAP_USER`
+
+IMAP username.
+
+#### `IMAP_PASS`
+
+IMAP password.
+
+#### `IMAP_SSL`
+
+Enable SSL. Defaults to `true`.
+
+#### `IMAP_STARTTLS`
+
+Enable STARTSSL. Defaults to `false`.
+
+#### `IMAP_MAILBOX`
+
+The name of the mailbox where incoming mail will end up. Defaults to `inbox`.
+
+#### `LDAP_ENABLED`
+
+Enable LDAP. Defaults to `false`
+
+#### `LDAP_LABEL`
+
+Label to show on login tab for LDAP server. Defaults to 'LDAP'
+
+#### `LDAP_HOST`
+
+LDAP Host
+
+#### `LDAP_PORT`
+
+LDAP Port. Defaults to `389`
+
+#### `LDAP_UID`
+
+LDAP UID. Defaults to `sAMAccountName`
+
+#### `LDAP_METHOD`
+
+LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain`
+
+#### `LDAP_VERIFY_SSL`
+
+LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true`
+
+#### `LDAP_CA_FILE`
+
+Specifies the path to a file containing a PEM-format CA certificate. Defaults to ``
+
+#### `LDAP_SSL_VERSION`
+
+Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to ``
+
+#### `LDAP_BIND_DN`
+
+No default.
+
+#### `LDAP_PASS`
+
+LDAP password
+
+#### `LDAP_TIMEOUT`
+
+Timeout, in seconds, for LDAP queries. Defaults to `10`.
+
+#### `LDAP_ACTIVE_DIRECTORY`
+
+Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`,
+
+#### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN`
+
+If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`.
+
+#### `LDAP_BLOCK_AUTO_CREATED_USERS`
+
+Locks down those users until they have been cleared by the admin. Defaults to `false`.
+
+#### `LDAP_BASE`
+
+Base where we can search for users. No default.
+
+#### `LDAP_USER_FILTER`
+
+Filter LDAP users. No default.
+
+#### `LDAP_USER_ATTRIBUTE_USERNAME`
+
+Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']`
+
+#### `LDAP_USER_ATTRIBUTE_MAIL`
+
+Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']`
+
+#### `LDAP_USER_ATTRIBUTE_NAME`
+
+Attribute field for the used username of a user. Default to `cn`.
+
+#### `LDAP_USER_ATTRIBUTE_FIRSTNAME`
+
+Attribute field for the forename of a user. Default to `givenName`
+
+#### `LDAP_USER_ATTRIBUTE_LASTNAME`
+
+ Attribute field for the surname of a user. Default to `sn`
+
+#### `LDAP_LOWERCASE_USERNAMES`
+
+GitLab will lower case the username for the LDAP Server. Defaults to `false`
+
+#### `LDAP_PREVENT_LDAP_SIGN_IN`
+
+Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), defaults to `false`
+
+#### `OAUTH_ENABLED`
+
+Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`.
+
+#### `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER`
+
+Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
+
+#### `OAUTH_ALLOW_SSO`
+
+Comma separated list of oauth providers for single sign-on. This allows users to login without having a user account. The account is created automatically when authentication is successful. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
+
+#### `OAUTH_BLOCK_AUTO_CREATED_USERS`
+
+Locks down those users until they have been cleared by the admin. Defaults to `true`.
+
+#### `OAUTH_AUTO_LINK_LDAP_USER`
+
+Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`.
+
+#### `OAUTH_AUTO_LINK_SAML_USER`
+
+Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`.
+
+#### `OAUTH_AUTO_LINK_USER`
+
+Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`.
+
+#### `OAUTH_EXTERNAL_PROVIDERS`
+
+Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
+
+#### `OAUTH_CAS3_LABEL`
+
+The "Sign in with" button label. Defaults to "cas3".
+
+#### `OAUTH_CAS3_SERVER`
+
+CAS3 server URL. No defaults.
+
+#### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION`
+
+Disable CAS3 SSL verification. Defaults to `false`.
+
+#### `OAUTH_CAS3_LOGIN_URL`
+
+CAS3 login URL. Defaults to `/cas/login`
+
+#### `OAUTH_CAS3_VALIDATE_URL`
+
+CAS3 validation URL. Defaults to `/cas/p3/serviceValidate`
+
+#### `OAUTH_CAS3_LOGOUT_URL`
+
+CAS3 logout URL. Defaults to `/cas/logout`
+
+#### `OAUTH_GOOGLE_API_KEY`
+
+Google App Client ID. No defaults.
+
+#### `OAUTH_GOOGLE_APP_SECRET`
+
+Google App Client Secret. No defaults.
+
+#### `OAUTH_GOOGLE_RESTRICT_DOMAIN`
+
+List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults.
+
+#### `OAUTH_FACEBOOK_API_KEY`
+
+Facebook App API key. No defaults.
+
+#### `OAUTH_FACEBOOK_APP_SECRET`
+
+Facebook App API secret. No defaults.
+
+#### `OAUTH_TWITTER_API_KEY`
+
+Twitter App API key. No defaults.
+
+#### `OAUTH_TWITTER_APP_SECRET`
+
+Twitter App API secret. No defaults.
+
+#### `OAUTH_AUTHENTIQ_CLIENT_ID`
+
+authentiq Client ID. No defaults.
+
+#### `OAUTH_AUTHENTIQ_CLIENT_SECRET`
+
+authentiq Client secret. No defaults.
+
+#### `OAUTH_AUTHENTIQ_SCOPE`
+
+Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'`
+
+#### `OAUTH_AUTHENTIQ_REDIRECT_URI`
+
+ Callback URL for Authentiq. No defaults.
+
+#### `OAUTH_GITHUB_API_KEY`
+
+GitHub App Client ID. No defaults.
+
+#### `OAUTH_GITHUB_APP_SECRET`
+
+GitHub App Client secret. No defaults.
+
+#### `OAUTH_GITHUB_URL`
+
+Url to the GitHub Enterprise server. Defaults to https://github.com
+
+#### `OAUTH_GITHUB_VERIFY_SSL`
+
+Enable SSL verification while communicating with the GitHub server. Defaults to `true`.
+
+#### `OAUTH_GITLAB_API_KEY`
+
+GitLab App Client ID. No defaults.
+
+#### `OAUTH_GITLAB_APP_SECRET`
+
+GitLab App Client secret. No defaults.
+
+#### `OAUTH_BITBUCKET_API_KEY`
+
+BitBucket App Client ID. No defaults.
+
+#### `OAUTH_BITBUCKET_APP_SECRET`
+
+BitBucket App Client secret. No defaults.
+
+#### `OAUTH_BITBUCKET_URL`
+
+Bitbucket URL. Defaults: https://bitbucket.org/
+
+#### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL`
+
+The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`.
+
+#### `OAUTH_SAML_IDP_CERT_FINGERPRINT`
+
+The SHA1 fingerprint of the certificate. No Defaults.
+
+#### `OAUTH_SAML_IDP_SSO_TARGET_URL`
+
+The URL to which the authentication request should be sent. No defaults.
+
+#### `OAUTH_SAML_ISSUER`
+
+The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`.
+
+#### `OAUTH_SAML_LABEL`
+
+The "Sign in with" button label. Defaults to "Our SAML Provider".
+
+#### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT`
+
+Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient`
+
+#### `OAUTH_SAML_GROUPS_ATTRIBUTE`
+
+Map groups attribute in a SAMLResponse to external groups. No defaults.
+
+#### `OAUTH_SAML_EXTERNAL_GROUPS`
+
+List of external groups in a SAMLResponse. Value is comma separated list of single quoted groups. Example: `'group1','group2'`. No defaults.
+
+#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL`
+
+Map 'email' attribute name in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
+
+#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
+
+Map 'username' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
+
+#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME`
+
+Map 'name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
+
+#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME`
+
+Map 'first_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
+
+#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME`
+
+Map 'last_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
+
+#### `OAUTH_CROWD_SERVER_URL`
+
+Crowd server url. No defaults.
+
+#### `OAUTH_CROWD_APP_NAME`
+
+Crowd server application name. No defaults.
+
+#### `OAUTH_CROWD_APP_PASSWORD`
+
+Crowd server application password. No defaults.
+
+#### `OAUTH_AUTH0_CLIENT_ID`
+
+Auth0 Client ID. No defaults.
+
+#### `OAUTH_AUTH0_CLIENT_SECRET`
+
+Auth0 Client secret. No defaults.
+
+#### `OAUTH_AUTH0_DOMAIN`
+
+Auth0 Domain. No defaults.
+
+#### `OAUTH_AUTH0_SCOPE`
+
+Auth0 Scope. Defaults to `openid profile email`.
+
+#### `OAUTH_AZURE_API_KEY`
+
+Azure Client ID. No defaults.
+
+#### `OAUTH_AZURE_API_SECRET`
+
+Azure Client secret. No defaults.
+
+#### `OAUTH_AZURE_TENANT_ID`
+
+Azure Tenant ID. No defaults.
+
+#### `OAUTH2_GENERIC_APP_ID`
+
+Your OAuth2 App ID. No defaults.
+
+#### `OAUTH2_GENERIC_APP_SECRET`
+
+Your OAuth2 App Secret. No defaults.
+
+#### `OAUTH2_GENERIC_CLIENT_SITE`
+
+The OAuth2 generic client site. No defaults
+
+#### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`
+
+The OAuth2 generic client user info url. No defaults
+
+#### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`
+
+The OAuth2 generic client authorize url. No defaults
+
+#### `OAUTH2_GENERIC_CLIENT_TOKEN_URL`
+
+The OAuth2 generic client token url. No defaults
+
+#### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`
+
+The OAuth2 generic client end session endpoint. No defaults
+
+#### `OAUTH2_GENERIC_ID_PATH`
+
+The OAuth2 generic id path. No defaults
+
+#### `OAUTH2_GENERIC_USER_UID`
+
+The OAuth2 generic user id path. No defaults
+
+#### `OAUTH2_GENERIC_USER_NAME`
+
+The OAuth2 generic user name. No defaults
+
+#### `OAUTH2_GENERIC_USER_EMAIL`
+
+The OAuth2 generic user email. No defaults
+
+#### `OAUTH2_GENERIC_NAME`
+
+The name of your OAuth2 provider. No defaults
+
+#### `GITLAB_GRAVATAR_ENABLED`
+
+Enables gravatar integration. Defaults to `true`.
+
+#### `GITLAB_GRAVATAR_HTTP_URL`
+
+Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html).
+
+#### `GITLAB_GRAVATAR_HTTPS_URL`
+
+Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`.
+
+#### `USERMAP_UID`
+
+Sets the uid for user `git` to the specified uid. Defaults to `1000`.
+
+#### `USERMAP_GID`
+
+Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`.
+
+#### `GOOGLE_ANALYTICS_ID`
+
+Google Analytics ID. No defaults.
+
+#### `PIWIK_URL`
+
+Sets the Piwik URL. No defaults.
+
+#### `PIWIK_SITE_ID`
+
+Sets the Piwik site ID. No defaults.
+
+#### `AWS_BACKUPS`
+
+Enables automatic uploads to an Amazon S3 instance. Defaults to `false`.
+
+#### `AWS_BACKUP_REGION`
+
+AWS region. No defaults.
+
+#### `AWS_BACKUP_ENDPOINT`
+
+AWS endpoint. No defaults.
+
+#### `AWS_BACKUP_ACCESS_KEY_ID`
+
+AWS access key id. No defaults.
+
+#### `AWS_BACKUP_SECRET_ACCESS_KEY`
+
+AWS secret access key. No defaults.
+
+#### `AWS_BACKUP_BUCKET`
+
+AWS bucket for backup uploads. No defaults.
+
+#### `AWS_BACKUP_MULTIPART_CHUNK_SIZE`
+
+Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html)
+
+#### `AWS_BACKUP_ENCRYPTION`
+
+Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html)
+
+#### `AWS_BACKUP_STORAGE_CLASS`
+
+Configure the storage class for the item. Defaults to `STANDARD`  See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html)
+
+#### `AWS_BACKUP_SIGNATURE_VERSION`
+
+Configure the storage signature version. Defaults to `4`  See at [AWS S3 Docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version)
+
+#### `GCS_BACKUPS`
+
+Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`.
+
+#### `GCS_BACKUP_ACCESS_KEY_ID`
+
+GCS access key id. No defaults
+
+#### `GCS_BACKUP_SECRET_ACCESS_KEY`
+
+GCS secret access key. No defaults
+
+#### `GCS_BACKUP_BUCKET`
+
+GCS bucket for backup uploads. No defaults
+
+#### `GITLAB_ROBOTS_PATH`
+
+Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples.
+
+#### `RACK_ATTACK_ENABLED`
+
+Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`.
+
+#### `RACK_ATTACK_WHITELIST`
+
+Always allow requests from whitelisted host. Defaults to `127.0.0.1`
+
+#### `RACK_ATTACK_MAXRETRY`
+
+Number of failed auth attempts before which an IP should be banned. Defaults to `10`
+
+#### `RACK_ATTACK_FINDTIME`
+
+Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`.
+
+#### `RACK_ATTACK_BANTIME`
+
+Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`.
+
+#### `GITLAB_WORKHORSE_TIMEOUT`
+
+Timeout for gitlab workhorse http proxy. Defaults to `5m0s`.
+
+#### `SENTRY_ENABLED`
+
+Enables Error Reporting and Logging with Sentry. Defaults to `false`.
+
+#### `SENTRY_DSN`
+
+Sentry DSN. No defaults.
+
+#### `SENTRY_CLIENTSIDE_DSN`
+
+Sentry clientside DSN. No defaults.
+
+#### `SENTRY_ENVIRONMENT`
+
+Sentry environment. Defaults to `production`.
 
 ### Docker secrets and configs
 

From 3857899f877698f7d17816f05c1635a1bed46310 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 5 Mar 2022 23:07:34 +0900
Subject: [PATCH 0731/1124] [skip ci] remove duplicated config parameter
 description

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7942a4b70..0eaa01874 100644
--- a/README.md
+++ b/README.md
@@ -1269,10 +1269,6 @@ AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
-
-AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
-
 #### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
@@ -1739,7 +1735,7 @@ Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, els
 
 #### `SMTP_DOMAIN`
 
-SMTP domain. Defaults to` www.gmail.com`
+SMTP domain. Defaults to `www.gmail.com`
 
 #### `SMTP_HOST`
 

From 9145c48390ec1dae5b61b5d72cabb040b9d4cb9a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 27 Mar 2022 11:02:35 +0200
Subject: [PATCH 0732/1124] Add circle-ci badge and lint readme

---
 README.md | 63 +++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index fc292d355..9e164895c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
-
 # sameersbn/gitlab:14.9.1
 
+[![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
+
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
 - [Contributing](#contributing)
@@ -199,7 +199,7 @@ docker run --name gitlab -d \
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
 
-__NOTE__: Please allow a couple of minutes for the GitLab application to start.
+**NOTE**: Please allow a couple of minutes for the GitLab application to start.
 
 Point your browser to `http://localhost:10080` and set a password for the `root` user account.
 
@@ -213,7 +213,7 @@ You should now have the GitLab application up and ready for testing. If you want
 
 GitLab is a code hosting software and as such you don't want to lose your code when the docker container is stopped/deleted. To avoid losing any data, you should mount a volume at,
 
-* `/home/git/data`
+- `/home/git/data`
 
 *Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.*
 
@@ -313,10 +313,10 @@ docker run --name gitlab -d --link gitlab-postgresql:postgresql \
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
 
- - [postgres](https://hub.docker.com/_/postgres/)
- - [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
- - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
- - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
+- [postgres](https://hub.docker.com/_/postgres/)
+- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
+- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
+- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
 
 #### Upgrading PostgreSQL
 
@@ -419,6 +419,7 @@ Access to the gitlab application can be secured using SSL so as to prevent unaut
 Jump to the [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) section if you are using a load balancer such as hipache, haproxy or nginx.
 
 To secure your application via SSL you basically need two things:
+
 - **Private key (.key)**
 - **SSL certificate (.crt)**
 
@@ -470,7 +471,6 @@ In case use of docker-compose ...
 
 look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint"
 
-
 ```bash
 mkdir -p /srv/docker/gitlab/gitlab/certs
 cp gitlab.key /srv/docker/gitlab/gitlab/certs/
@@ -593,7 +593,7 @@ Refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/omniaut
 
 #### CAS3
 
-To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: https://git.example.com:443/users/auth/cas3/callback?url. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
+To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://git.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
 
 For example, if your cas server url is `https://sso.example.com`, then adding `--env 'OAUTH_CAS3_SERVER=https://sso.example.com'` to the docker run command enables support for CAS3 OAuth. Please refer to [Available Configuration Parameters](#available-configuration-parameters) for additional CAS3 configuration parameters.
 
@@ -709,14 +709,14 @@ Gitlab pages access control requires additional configuration before activating
 
 Gitab pages access control makes use of the Gitlab OAuth Module.
 
- - Goto the Gitlab Admin area
- - Select `Applications` in the menu
- - Create `New Application`
-   - Name: `Gitlab Pages`
-   - Scopes:
-     - api
-   - Trusted: NO (Do not select)
-   - Redirect URI: https://projects.<GITLAB_PAGES_DOMAIN>/auth
+- Goto the Gitlab Admin area
+- Select `Applications` in the menu
+- Create `New Application`
+    - Name: `Gitlab Pages`
+    - Scopes:
+        - api
+    - Trusted: NO (Do not select)
+    - Redirect URI: `https://projects.<GITLAB_PAGES_DOMAIN>/auth`
 
 Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is to following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint.
 
@@ -741,7 +741,6 @@ Add to following environment variables to your Gitlab Container.
 
 After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project.
 
-
 ### External Issue Trackers
 
 Since version `7.10.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
@@ -777,12 +776,10 @@ These options should contain something like:
 - `PIWIK_URL=piwik.example.org`
 - `PIWIK_SITE_ID=42`
 
-
 ### Available Configuration Parameters
 
 *Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)*
 
-
 Below is the complete list of available options that can be used to customize your gitlab installation.
 
 #### `DEBUG`
@@ -2023,7 +2020,7 @@ GitHub App Client secret. No defaults.
 
 #### `OAUTH_GITHUB_URL`
 
-Url to the GitHub Enterprise server. Defaults to https://github.com
+Url to the GitHub Enterprise server. Defaults to `https://github.com`
 
 #### `OAUTH_GITHUB_VERIFY_SSL`
 
@@ -2047,7 +2044,7 @@ BitBucket App Client secret. No defaults.
 
 #### `OAUTH_BITBUCKET_URL`
 
-Bitbucket URL. Defaults: https://bitbucket.org/
+Bitbucket URL. Defaults: `https://bitbucket.org/`
 
 #### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL`
 
@@ -2415,7 +2412,6 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b
 docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493
 ```
 
-
 ## Host Key Backups (ssh)
 
 SSH keys are not backed up in the normal gitlab backup process. You
@@ -2477,7 +2473,7 @@ Or
 docker exec -it gitlab sudo -HEu git bundle exec rake gitlab:import:repos RAILS_ENV=production
 ```
 
-For a complete list of available rake tasks please refer https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks or the help section of your gitlab installation.
+For a complete list of available rake tasks please refer <https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks> or the help section of your gitlab installation.
 
 *P.S. Please avoid running the rake tasks for backup and restore operations on a running gitlab instance.*
 
@@ -2513,7 +2509,7 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
+> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8>).
 >
 > As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
@@ -2550,7 +2546,6 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 - **Step 4**: Start the image
 
 > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
-
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
@@ -2609,10 +2604,10 @@ docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab)
 
 # References
 
-* https://github.com/gitlabhq/gitlabhq
-* https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md
-* http://wiki.nginx.org/HttpSslModule
-* https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
-* https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/nginx/gitlab-ssl
-* https://github.com/jpetazzo/nsenter
-* https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/
+- <https://github.com/gitlabhq/gitlabhq>
+- <https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md>
+- <http://wiki.nginx.org/HttpSslModule>
+- <https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html>
+- <https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/nginx/gitlab-ssl>
+- <https://github.com/jpetazzo/nsenter>
+- <https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/>

From c191f74d7a69c54fa27282209377ac0e52e686e3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 27 Mar 2022 11:05:23 +0200
Subject: [PATCH 0733/1124] Fix Multiple top-level headings in document

---
 README.md | 902 +++++++++++++++++++++++++++---------------------------
 1 file changed, 451 insertions(+), 451 deletions(-)

diff --git a/README.md b/README.md
index 9e164895c..cd8347326 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@
 - [Deploy in Docker Swarm mode, with HTTPS handled by Traefik proxy and Docker Registry](docs/docker-swarm-traefik-registry.md)
 - [References](#references)
 
-# Introduction
+## Introduction
 
 Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform.
 
@@ -76,7 +76,7 @@ GitLab CE is set up in the Docker image using the [install from source](https://
 
 For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/install/) which includes a [GitLab image for Docker](https://docs.gitlab.com/omnibus/docker/).
 
-# Contributing
+## Contributing
 
 If you find this image useful here's how you can help:
 
@@ -84,14 +84,14 @@ If you find this image useful here's how you can help:
 - Be a part of the community and help resolve [Issues](https://github.com/sameersbn/docker-gitlab/issues)
 - Support the development of this image with a [donation](http://www.damagehead.com/donate/)
 
-# Team
+## Team
 
 - Niclas Mietz ([solidnerd](https://github.com/solidnerd))
 - Sameer Naik ([sameersbn](https://github.com/sameersbn))
 
 See [Contributors](../../graphs/contributors) for the complete list developers that have contributed to this project.
 
-# Issues
+## Issues
 
 Docker is a relatively new project and is active being developed and tested by a thriving community of developers and testers and every release of docker features many enhancements and bugfixes.
 
@@ -116,11 +116,11 @@ In your issue report please make sure you provide the following information:
 - Output of the `docker info` command
 - The `docker run` command you used to run the image (mask out the sensitive bits).
 
-# Prerequisites
+## Prerequisites
 
 Your docker host needs to have 1GB or more of available RAM to run GitLab. Please refer to the GitLab [hardware requirements](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/requirements.md#hardware-requirements) documentation for additional information.
 
-# Installation
+## Installation
 
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
@@ -140,7 +140,7 @@ Alternatively you can build the image locally.
 docker build -t sameersbn/gitlab github.com/sameersbn/docker-gitlab
 ```
 
-# Quick Start
+## Quick Start
 
 The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/).
 
@@ -207,9 +207,9 @@ You should now have the GitLab application up and ready for testing. If you want
 
 *The rest of the document will use the docker command line. You can quite simply adapt your configuration into a `docker-compose.yml` file if you wish to do so.*
 
-# Configuration
+## Configuration
 
-## Data Store
+### Data Store
 
 GitLab is a code hosting software and as such you don't want to lose your code when the docker container is stopped/deleted. To avoid losing any data, you should mount a volume at,
 
@@ -232,17 +232,17 @@ docker run --name gitlab -d \
     sameersbn/gitlab:14.9.1
 ```
 
-## Database
+### Database
 
 GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL.
 
 *Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL*
 
-### PostgreSQL
+#### PostgreSQL
 
 *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x
 
-#### External PostgreSQL Server
+##### External PostgreSQL Server
 
 The image also supports using an external PostgreSQL Server. This is also controlled via environment variables.
 
@@ -267,7 +267,7 @@ docker run --name gitlab -d \
     sameersbn/gitlab:14.9.1
 ```
 
-#### Linking to PostgreSQL Container
+##### Linking to PostgreSQL Container
 
 You can link this image with a postgresql container for the database requirements. The alias of the postgresql server container should be set to **postgresql** while linking with the gitlab image.
 
@@ -318,7 +318,7 @@ Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PA
 - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
 - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
 
-#### Upgrading PostgreSQL
+##### Upgrading PostgreSQL
 
 When this Gitlab image upgrades its dependency on specific version of PostgreSQL you will need to make sure to use corresponding version of PostgreSQL.
 
@@ -330,15 +330,15 @@ Following project provides Docker image that handles migration of PostgreSQL dat
 
 After migration of the data, verify that other PostgreSQL configuration files in its data folder are copied over as well. One such file is `pg_hba.conf`, it will need to be copied from old version data folder into new version data folder.
 
-## Redis
+### Redis
 
 GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables.
 
-### Internal Redis Server
+#### Internal Redis Server
 
 The internal redis server has been removed from the image. Please use a [linked redis](#linking-to-redis-container) container or specify a [external redis](#external-redis-server) connection.
 
-### External Redis Server
+#### External Redis Server
 
 The image can be configured to use an external redis server. The configuration should be specified using environment variables while starting the GitLab image.
 
@@ -350,7 +350,7 @@ docker run --name gitlab -it --rm \
     sameersbn/gitlab:14.9.1
 ```
 
-### Linking to Redis Container
+#### Linking to Redis Container
 
 You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image.
 
@@ -377,7 +377,7 @@ docker run --name gitlab -d --link gitlab-redis:redisio \
     sameersbn/gitlab:14.9.1
 ```
 
-### Mail
+#### Mail
 
 The mail configuration should be specified using environment variables while starting the GitLab image. The configuration defaults to using gmail to send emails and requires the specification of a valid username and password to login to the gmail servers.
 
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
 
-#### Reply by email
+##### Reply by email
 
 Since version `8.0.0` GitLab adds support for commenting on issues by replying to emails.
 
@@ -412,7 +412,7 @@ docker run --name gitlab -d \
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
 
-### SSL
+#### SSL
 
 Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section.
 
@@ -425,7 +425,7 @@ To secure your application via SSL you basically need two things:
 
 When using CA certified certificates, these files are provided to you by the CA. When using self-signed certificates you need to generate these files yourself. Skip to [Strengthening the server security](#strengthening-the-server-security) section if you are armed with CA certified SSL certificates.
 
-#### Generation of a Self Signed Certificate
+##### Generation of a Self Signed Certificate
 
 Generation of a self-signed SSL certificate involves a simple 3-step procedure:
 
@@ -449,7 +449,7 @@ openssl x509 -req -days 3650 -in gitlab.csr -signkey gitlab.key -out gitlab.crt
 
 Congratulations! You now have a self-signed SSL certificate valid for 10 years.
 
-#### Strengthening the server security
+##### Strengthening the server security
 
 This section provides you with instructions to [strengthen your server security](https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html). To achieve this we need to generate stronger DHE parameters.
 
@@ -457,7 +457,7 @@ This section provides you with instructions to [strengthen your server security]
 openssl dhparam -out dhparam.pem 2048
 ```
 
-#### Installation of the SSL Certificates
+##### Installation of the SSL Certificates
 
 Out of the four files generated above, we need to install the `gitlab.key`, `gitlab.crt` and `dhparam.pem` files at the gitlab server. The CSR file is not needed, but do make sure you safely backup the file (in case you ever need it again).
 
@@ -481,7 +481,7 @@ chmod 400 /srv/docker/gitlab/gitlab/certs/gitlab.key
 
 Great! we are now just one step away from having our application secured.
 
-#### Enabling HTTPS support
+##### Enabling HTTPS support
 
 HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Additionally, when using self-signed SSL certificates you need to the set `SSL_SELF_SIGNED` option to `true` as well. Assuming we are using self-signed certificates
 
@@ -496,7 +496,7 @@ docker run --name gitlab -d \
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
 
-#### Configuring HSTS
+##### Configuring HSTS
 
 HSTS if supported by the browsers makes sure that your users will only reach your sever via HTTPS. When the user comes for the first time it sees a header from the server which states for how long from now this site should only be reachable via HTTPS - that's the HSTS max-age value.
 
@@ -512,7 +512,7 @@ docker run --name gitlab -d \
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
 
-#### Using HTTPS with a load balancer
+##### Using HTTPS with a load balancer
 
 Load balancers like nginx/haproxy/hipache talk to backend applications over plain http and as such the installation of ssl keys and certificates are not required and should **NOT** be installed in the container. The SSL configuration has to instead be done at the load balancer.
 
@@ -539,7 +539,7 @@ In case GitLab responds to any kind of POST request (login, OAUTH, changing sett
 
 `proxy_set_header X-Forwarded-Ssl on;` (nginx format)
 
-#### Establishing trust with your server
+##### Establishing trust with your server
 
 This section deals will self-signed ssl certificates. If you are using CA certified certificates, your done.
 
@@ -558,7 +558,7 @@ You can do the same at the web browser. Instructions for installing the root cer
 
 There you have it, that's all there is to it.
 
-#### Installing Trusted SSL Server Certificates
+##### Installing Trusted SSL Server Certificates
 
 If your GitLab CI server is using self-signed SSL certificates then you should make sure the GitLab CI server certificate is trusted on the GitLab server for them to be able to talk to each other.
 
@@ -568,7 +568,7 @@ Copy the `ca.crt` file into the certs directory on the [datastore](#data-store).
 
 By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificate) is added to the trusted certificates list.
 
-### Deploy to a subdirectory (relative url root)
+#### Deploy to a subdirectory (relative url root)
 
 By default GitLab expects that your application is running at the root (eg. /). This section explains how to run your application inside a directory.
 
@@ -585,19 +585,19 @@ GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/g
 
 **Note**: *The `GITLAB_RELATIVE_URL_ROOT` parameter should always begin with a slash and* **SHOULD NOT** *have any trailing slashes.*
 
-### OmniAuth Integration
+#### OmniAuth Integration
 
 GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.
 
 Refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/omniauth.html) for additional information.
 
-#### CAS3
+##### CAS3
 
 To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://git.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
 
 For example, if your cas server url is `https://sso.example.com`, then adding `--env 'OAUTH_CAS3_SERVER=https://sso.example.com'` to the docker run command enables support for CAS3 OAuth. Please refer to [Available Configuration Parameters](#available-configuration-parameters) for additional CAS3 configuration parameters.
 
-#### Authentiq
+##### Authentiq
 
 To enable the Authentiq OmniAuth provider for passwordless authentication you must register an application with [Authentiq](https://www.authentiq.com/). Please refer to the GitLab [documentation](https://docs.gitlab.com/ce/administration/auth/authentiq.html) for the procedure to generate the client ID and secret key with Authentiq.
 
@@ -607,7 +607,7 @@ For example, if your API key is `xxx` and the API secret key is `yyy`, then addi
 
 You may want to specify `OAUTH_AUTHENTIQ_REDIRECT_URI` as well. The OAuth scope can be altered as well with `OAUTH_AUTHENTIQ_SCOPE` (defaults to `'aq:name email~rs address aq:push'`).
 
-#### Google
+##### Google
 
 To enable the Google OAuth2 OmniAuth provider you must register your application with Google. Google will generate a client ID and secret key for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/google.html) for the procedure to generate the client ID and secret key with google.
 
@@ -617,7 +617,7 @@ For example, if your client ID is `xxx.apps.googleusercontent.com` and client se
 
 You can also restrict logins to a single domain by adding `--env "OAUTH_GOOGLE_RESTRICT_DOMAIN='example.com'"`.
 
-#### Facebook
+##### Facebook
 
 To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret.
 
@@ -625,7 +625,7 @@ Once you have the API key and secret generated, configure them using the `OAUTH_
 
 For example, if your API key is `xxx` and the API secret key is `yyy`, then adding `--env 'OAUTH_FACEBOOK_API_KEY=xxx' --env 'OAUTH_FACEBOOK_APP_SECRET=yyy'` to the docker run command enables support for Facebook OAuth.
 
-#### Twitter
+##### Twitter
 
 To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter.
 
@@ -633,7 +633,7 @@ Once you have the API key and secret generated, configure them using the `OAUTH_
 
 For example, if your API key is `xxx` and the API secret key is `yyy`, then adding `--env 'OAUTH_TWITTER_API_KEY=xxx' --env 'OAUTH_TWITTER_APP_SECRET=yyy'` to the docker run command enables support for Twitter OAuth.
 
-#### GitHub
+##### GitHub
 
 To enable the GitHub OAuth2 OmniAuth provider you must register your application with GitHub. GitHub will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/github.html) for the procedure to generate the Client ID and secret with github.
 
@@ -643,7 +643,7 @@ For example, if your Client ID is `xxx` and the Client secret is `yyy`, then add
 
 Users of GitHub Enterprise may want to specify `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` as well.
 
-#### GitLab
+##### GitLab
 
 To enable the GitLab OAuth2 OmniAuth provider you must register your application with GitLab. GitLab will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/gitlab.html) for the procedure to generate the Client ID and secret with GitLab.
 
@@ -651,7 +651,7 @@ Once you have the Client ID and secret generated, configure them using the `OAUT
 
 For example, if your Client ID is `xxx` and the Client secret is `yyy`, then adding `--env 'OAUTH_GITLAB_API_KEY=xxx' --env 'OAUTH_GITLAB_APP_SECRET=yyy'` to the docker run command enables support for GitLab OAuth.
 
-#### BitBucket
+##### BitBucket
 
 To enable the BitBucket OAuth2 OmniAuth provider you must register your application with BitBucket. BitBucket will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/bitbucket.html) for the procedure to generate the Client ID and secret with BitBucket.
 
@@ -659,7 +659,7 @@ Once you have the Client ID and secret generated, configure them using the `OAUT
 
 For example, if your Client ID is `xxx` and the Client secret is `yyy`, then adding `--env 'OAUTH_BITBUCKET_API_KEY=xxx' --env 'OAUTH_BITBUCKET_APP_SECRET=yyy'` to the docker run command enables support for BitBucket OAuth.
 
-#### SAML
+##### SAML
 
 GitLab can be configured to act as a SAML 2.0 Service Provider (SP). This allows GitLab to consume assertions from a SAML 2.0 Identity Provider (IdP) such as Microsoft ADFS to authenticate users. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/saml.html).
 
@@ -669,19 +669,19 @@ You can also override the default "Sign in with" button label with `OAUTH_SAML_L
 
 Please refer to [Available Configuration Parameters](#available-configuration-parameters) for the default configurations of these parameters.
 
-#### Crowd
+##### Crowd
 
 To enable the Crowd server OAuth2 OmniAuth provider you must register your application with Crowd server.
 
 Configure GitLab to enable access the Crowd server by specifying the `OAUTH_CROWD_SERVER_URL`, `OAUTH_CROWD_APP_NAME` and `OAUTH_CROWD_APP_PASSWORD` environment variables.
 
-#### Auth0
+##### Auth0
 
 To enable the Auth0 OmniAuth provider you must register your application with [auth0](https://auth0.com/).
 
 Configure the following environment variables `OAUTH_AUTH0_CLIENT_ID`, `OAUTH_AUTH0_CLIENT_SECRET` and `OAUTH_AUTH0_DOMAIN` to complete the integration.
 
-#### Microsoft Azure
+##### Microsoft Azure
 
 To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your application with Azure. Azure will generate a Client ID, Client secret and Tenant ID for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/azure.html) for the procedure.
 
@@ -689,7 +689,7 @@ Once you have the Client ID, Client secret and Tenant ID generated, configure th
 
 For example, if your Client ID is `xxx`, the Client secret is `yyy` and the Tenant ID is `zzz`, then adding `--env 'OAUTH_AZURE_API_KEY=xxx' --env 'OAUTH_AZURE_API_SECRET=yyy' --env 'OAUTH_AZURE_TENANT_ID=zzz'` to the docker run command enables support for Microsoft Azure OAuth.
 
-#### Generic OAuth2
+##### Generic OAuth2
 
 To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure.
 
@@ -697,11 +697,11 @@ As an example this code has been tested with Keycloak, with the following variab
 
 See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details.
 
-### Gitlab Pages
+#### Gitlab Pages
 
 Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`.
 
-### Gitlab Pages Access Control
+#### Gitlab Pages Access Control
 
 Since version `11.5.0` Gitlab pages supports access control. This allows only access to a published website if you are a project member, or have access to a certain project.
 
@@ -741,7 +741,7 @@ Add to following environment variables to your Gitlab Container.
 
 After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project.
 
-### External Issue Trackers
+#### External Issue Trackers
 
 Since version `7.10.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
 
@@ -749,7 +749,7 @@ If you are using the [docker-redmine](https://github.com/sameersbn/docker-redmin
 
 By using the above option the `/home/git/data/repositories` directory will be accessible by the redmine container and now you can add your git repository path to your redmine project. If, for example, in your gitlab server you have a project named `opensource/gitlab`, the bare repository will be accessible at `/home/git/data/repositories/opensource/gitlab.git` in the redmine container.
 
-### Host UID / GID Mapping
+#### Host UID / GID Mapping
 
 Per default the container is configured to run gitlab as user and group `git` with `uid` and `gid` `1000`. The host possibly uses this ids for different purposes leading to unfavorable effects. From the host it appears as if the mounted data volumes are owned by the host's user/group `1000`.
 
@@ -768,7 +768,7 @@ docker run --name gitlab -d [OPTIONS] \
     sameersbn/gitlab:14.9.1 app:sanitize
 ```
 
-### Piwik
+#### Piwik
 
 If you want to monitor your gitlab instance with [Piwik](http://piwik.org/), there are two options to setup: `PIWIK_URL` and `PIWIK_SITE_ID`.
 These options should contain something like:
@@ -776,1549 +776,1549 @@ These options should contain something like:
 - `PIWIK_URL=piwik.example.org`
 - `PIWIK_SITE_ID=42`
 
-### Available Configuration Parameters
+#### Available Configuration Parameters
 
 *Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)*
 
 Below is the complete list of available options that can be used to customize your gitlab installation.
 
-#### `DEBUG`
+##### `DEBUG`
 
 Set this to `true` to enable entrypoint debugging.
 
-#### `TZ`
+##### `TZ`
 
 Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam`  See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`.
 
-#### `GITLAB_HOST`
+##### `GITLAB_HOST`
 
 The hostname of the GitLab server. Defaults to `localhost`
 
-#### `GITLAB_CI_HOST`
+##### `GITLAB_CI_HOST`
 
 If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults.
 
-#### `GITLAB_PORT`
+##### `GITLAB_PORT`
 
 The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`.
 
-#### `GITLAB_SECRETS_DB_KEY_BASE`
+##### `GITLAB_SECRETS_DB_KEY_BASE`
 
 Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults.
 
-#### `GITLAB_SECRETS_SECRET_KEY_BASE`
+##### `GITLAB_SECRETS_SECRET_KEY_BASE`
 
 Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults.
 
-#### `GITLAB_SECRETS_OTP_KEY_BASE`
+##### `GITLAB_SECRETS_OTP_KEY_BASE`
 
  Encryption key for OTP related stuff with  GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults.
 
-#### `GITLAB_TIMEZONE`
+##### `GITLAB_TIMEZONE`
 
 Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ`
 
-#### `GITLAB_ROOT_PASSWORD`
+##### `GITLAB_ROOT_PASSWORD`
 
 The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**.
 
-#### `GITLAB_ROOT_EMAIL`
+##### `GITLAB_ROOT_EMAIL`
 
 The email for the root user on firstrun. Defaults to `admin@example.com`
 
-#### `GITLAB_EMAIL`
+##### `GITLAB_EMAIL`
 
 The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`.
 
-#### `GITLAB_EMAIL_DISPLAY_NAME`
+##### `GITLAB_EMAIL_DISPLAY_NAME`
 
 The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`.
 
-#### `GITLAB_EMAIL_REPLY_TO`
+##### `GITLAB_EMAIL_REPLY_TO`
 
 The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`.
 
-#### `GITLAB_EMAIL_SUBJECT_SUFFIX`
+##### `GITLAB_EMAIL_SUBJECT_SUFFIX`
 
 The e-mail subject suffix used in e-mails sent by GitLab. No defaults.
 
-#### `GITLAB_EMAIL_ENABLED`
+##### `GITLAB_EMAIL_ENABLED`
 
 Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration.
 
-#### `GITLAB_EMAIL_SMIME_ENABLE`
+##### `GITLAB_EMAIL_SMIME_ENABLE`
 
 Enable or disable email S/MIME signing. Defaults is `false`.
 
-#### `GITLAB_EMAIL_SMIME_KEY_FILE`
+##### `GITLAB_EMAIL_SMIME_KEY_FILE`
 
 Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``.
 
-#### `GITLAB_EMAIL_SMIME_CERT_FILE`
+##### `GITLAB_EMAIL_SMIME_CERT_FILE`
 
 Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``.
 
-#### `GITLAB_DEFAULT_THEME`
+##### `GITLAB_DEFAULT_THEME`
 
 Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red)
 
-#### `GITLAB_ISSUE_CLOSING_PATTERN`
+##### `GITLAB_ISSUE_CLOSING_PATTERN`
 
 Issue closing pattern regex. See [GitLab's documentation](https://docs.gitlab.com/ee/administration/issue_closing_pattern.html) for more detail. Defaults to ` \b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ` .
 
-#### `GITLAB_INCOMING_EMAIL_ADDRESS`
+##### `GITLAB_INCOMING_EMAIL_ADDRESS`
 
 The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter.
 
-#### `GITLAB_INCOMING_EMAIL_ENABLED`
+##### `GITLAB_INCOMING_EMAIL_ENABLED`
 
 Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`.
 
-#### `GITLAB_SIGNUP_ENABLED`
+##### `GITLAB_SIGNUP_ENABLED`
 
 Enable or disable user signups (first run only). Default is `true`.
 
-#### `GITLAB_IMPERSONATION_ENABLED`
+##### `GITLAB_IMPERSONATION_ENABLED`
 
 Enable or disable impersonation. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_LIMIT`
+##### `GITLAB_PROJECTS_LIMIT`
 
 Set default projects limit. Defaults to `100`.
 
-#### `GITLAB_USERNAME_CHANGE`
+##### `GITLAB_USERNAME_CHANGE`
 
 Enable or disable ability for users to change their username. Defaults to `true`.
 
-#### `GITLAB_CREATE_GROUP`
+##### `GITLAB_CREATE_GROUP`
 
 Enable or disable ability for users to create groups. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_ISSUES`
+##### `GITLAB_PROJECTS_ISSUES`
 
 Set if *issues* feature should be enabled by default for new projects. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_MERGE_REQUESTS`
+##### `GITLAB_PROJECTS_MERGE_REQUESTS`
 
 Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_WIKI`
+##### `GITLAB_PROJECTS_WIKI`
 
 Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_SNIPPETS`
+##### `GITLAB_PROJECTS_SNIPPETS`
 
 Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`.
 
-#### `GITLAB_PROJECTS_BUILDS`
+##### `GITLAB_PROJECTS_BUILDS`
 
 Set if *builds* feature should be enabled by default for new projects. Defaults to `true`.
 
-#### `GITLAB_PROJECTS_CONTAINER_REGISTRY`
+##### `GITLAB_PROJECTS_CONTAINER_REGISTRY`
 
 Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`.
 
-#### `GITLAB_SHELL_CUSTOM_HOOKS_DIR`
+##### `GITLAB_SHELL_CUSTOM_HOOKS_DIR`
 
 Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`.
 
-#### `GITLAB_WEBHOOK_TIMEOUT`
+##### `GITLAB_WEBHOOK_TIMEOUT`
 
 Sets the timeout for webhooks. Defaults to `10` seconds.
 
-#### `GITLAB_NOTIFY_ON_BROKEN_BUILDS`
+##### `GITLAB_NOTIFY_ON_BROKEN_BUILDS`
 
 Enable or disable broken build notification emails. Defaults to `true`
 
-#### `GITLAB_NOTIFY_PUSHER`
+##### `GITLAB_NOTIFY_PUSHER`
 
 Add pusher to recipients list of broken build notification emails. Defaults to `false`
 
-#### `GITLAB_REPOS_DIR`
+##### `GITLAB_REPOS_DIR`
 
 The git repositories folder in the container. Defaults to `/home/git/data/repositories`
 
-#### `GITLAB_BACKUP_DIR`
+##### `GITLAB_BACKUP_DIR`
 
 The backup folder in the container. Defaults to `/home/git/data/backups`
 
-#### `GITLAB_BACKUP_DIR_CHOWN`
+##### `GITLAB_BACKUP_DIR_CHOWN`
 
 Optionally change ownership of backup files on start-up. Defaults to `true`
 
-#### `GITLAB_BACKUP_DIR_GROUP`
+##### `GITLAB_BACKUP_DIR_GROUP`
 
 Optionally group backups into a subfolder. Can also be used to place backups in to a subfolder on remote storage. Not used by default.
 
-#### `GITLAB_BUILDS_DIR`
+##### `GITLAB_BUILDS_DIR`
 
 The build traces directory. Defaults to `/home/git/data/builds`
 
-#### `GITLAB_DOWNLOADS_DIR`
+##### `GITLAB_DOWNLOADS_DIR`
 
 The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`.
 
-#### `GITLAB_SHARED_DIR`
+##### `GITLAB_SHARED_DIR`
 
 The directory to store the build artifacts. Defaults to `/home/git/data/shared`
 
-#### `GITLAB_ARTIFACTS_ENABLED`
+##### `GITLAB_ARTIFACTS_ENABLED`
 
 Enable/Disable GitLab artifacts support. Defaults to `true`.
 
-#### `GITLAB_ARTIFACTS_DIR`
+##### `GITLAB_ARTIFACTS_DIR`
 
 Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts`
 
-#### `AWS_ACCESS_KEY_ID`
+##### `AWS_ACCESS_KEY_ID`
 
 Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`
 
-#### `AWS_SECRET_ACCESS_KEY`
+##### `AWS_SECRET_ACCESS_KEY`
 
 Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`
 
-#### `AWS_REGION`
+##### `AWS_REGION`
 
 AWS Region. Defaults to `us-east-1`
 
-#### `AWS_HOST`
+##### `AWS_HOST`
 
 Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`
 
-#### `AWS_ENDPOINT`
+##### `AWS_ENDPOINT`
 
 AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`
 
-#### `AWS_PATH_STYLE`
+##### `AWS_PATH_STYLE`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true`
 
-#### `AWS_SIGNATURE_VERSION`
+##### `AWS_SIGNATURE_VERSION`
 
 AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4`
 
-#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+##### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Default Google project to use for Object Store.
 
-#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+##### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
 Default Google service account email to use for Object Store.
 
-#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+##### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
 
 Default Google key file Defaults to `/gcs/key.json`
 
-#### `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`
+##### `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`
 
 Default object store connection provider. Defaults to `AWS`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED`
 
 Enables Object Store for Artifacts that will be remote stored. Defaults to `false`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY`
 
 Bucket name to store the artifacts. Defaults to `artifacts`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD`
 
 Set to true to enable direct upload of Artifacts without the need of local shared storage.  Defaults to `false`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD`
 
 Temporary option to limit automatic upload. Defaults to `false`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER`
 
 Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
 
 AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
 
 AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION`
 
 AWS Region. Defaults to `$AWS_REGION`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST`
 
 Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
 AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
 
 AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
 Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
-#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
 
 Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
 
-#### `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON`
+##### `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON`
 
 Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'`
 
-#### `GITLAB_LFS_ENABLED`
+##### `GITLAB_LFS_ENABLED`
 
 Enable/Disable Git LFS support. Defaults to `true`.
 
-#### `GITLAB_LFS_OBJECTS_DIR`
+##### `GITLAB_LFS_OBJECTS_DIR`
 
 Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects`
 
-#### `GITLAB_LFS_OBJECT_STORE_ENABLED`
+##### `GITLAB_LFS_OBJECT_STORE_ENABLED`
 
 Enables Object Store for LFS that will be remote stored. Defaults to `false`
 
-#### `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY`
+##### `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY`
 
 Bucket name to store the LFS. Defaults to `lfs-object`
 
-#### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD`
+##### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD`
 
 Temporary option to limit automatic upload. Defaults to `false`
 
-#### `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD`
+##### `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER`
 
 Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
 
 AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
 
 AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION`
 
 AWS Region. Defaults to `$AWS_REGION`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST`
 
 Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
 AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
 
 AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
 Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
-#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
 
 Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
 
-#### `GITLAB_PACKAGES_ENABLED`
+##### `GITLAB_PACKAGES_ENABLED`
 
 Enable/Disable Pakages support. Defaults to `true`.
 
-#### `GITLAB_PACKAGES_DIR`
+##### `GITLAB_PACKAGES_DIR`
 
 Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED`
+##### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED`
 
 Enables Object Store for Packages that will be remote stored. Defaults to `false`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY`
+##### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY`
 
 Bucket name to store the packages. Defaults to `packages`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD`
+##### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD`
 
 Set to true to enable direct upload of Packages without the need of local shared storage.  Defaults to `false`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD`
+##### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD`
 
 Temporary option to limit automatic upload. Defaults to `false`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD`
+##### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER`
 
 Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
 
 AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
 
 AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION`
 
 AWS Region. Defaults to `$AWS_REGION`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST`
 
 Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
 AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
 Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
-#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
 
 Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
 
-#### `GITLAB_UPLOADS_STORAGE_PATH`
+##### `GITLAB_UPLOADS_STORAGE_PATH`
 
 The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`.
 
-#### `GITLAB_UPLOADS_BASE_DIR`
+##### `GITLAB_UPLOADS_BASE_DIR`
 
 Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_ENABLED`
+##### `GITLAB_UPLOADS_OBJECT_STORE_ENABLED`
 
 Enables Object Store for UPLOADS that will be remote stored. Defaults to `false`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY`
+##### `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY`
 
 Bucket name to store the UPLOADS. Defaults to `uploads`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD`
+##### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD`
 
 Temporary option to limit automatic upload. Defaults to `false`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD`
+##### `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD`
 
 Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER`
 
 Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
 
 AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
 
 AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION`
 
 AWS Region. Defaults to `$AWS_REGION`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST`
 
 Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
 AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
 Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
 Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
 Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
 
-#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
 
 Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
 
-#### `GITLAB_MATTERMOST_ENABLED`
+##### `GITLAB_MATTERMOST_ENABLED`
 
 Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`.
 
-#### `GITLAB_MATTERMOST_URL`
+##### `GITLAB_MATTERMOST_URL`
 
 Sets Mattermost URL. Defaults to `https://mattermost.example.com`.
 
-#### `GITLAB_BACKUP_SCHEDULE`
+##### `GITLAB_BACKUP_SCHEDULE`
 
 Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default
 
-#### `GITLAB_BACKUP_EXPIRY`
+##### `GITLAB_BACKUP_EXPIRY`
 
 Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds).
 
-#### `GITLAB_BACKUP_PG_SCHEMA`
+##### `GITLAB_BACKUP_PG_SCHEMA`
 
 Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524
 
-#### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS`
+##### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS`
 
 Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions)
 
-#### `GITLAB_BACKUP_TIME`
+##### `GITLAB_BACKUP_TIME`
 
 Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`.
 
-#### `GITLAB_BACKUP_SKIP`
+##### `GITLAB_BACKUP_SKIP`
 
 Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system)
 
-#### `GITLAB_SSH_HOST`
+##### `GITLAB_SSH_HOST`
 
 The ssh host. Defaults to **GITLAB_HOST**.
 
-#### `GITLAB_SSH_LISTEN_PORT`
+##### `GITLAB_SSH_LISTEN_PORT`
 
 The ssh port for SSHD to listen on. Defaults to `22`
 
-#### `GITLAB_SSH_MAXSTARTUPS`
+##### `GITLAB_SSH_MAXSTARTUPS`
 
 The ssh "MaxStartups" parameter, defaults to `10:30:60`.
 
-#### `GITLAB_SSH_PORT`
+##### `GITLAB_SSH_PORT`
 
 The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`.
 
-#### `GITLAB_RELATIVE_URL_ROOT`
+##### `GITLAB_RELATIVE_URL_ROOT`
 
 The relative url of the GitLab server, e.g. `/git`. No default.
 
-#### `GITLAB_TRUSTED_PROXIES`
+##### `GITLAB_TRUSTED_PROXIES`
 
 Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults.
 
-#### `GITLAB_REGISTRY_ENABLED`
+##### `GITLAB_REGISTRY_ENABLED`
 
 Enables the GitLab Container Registry. Defaults to `false`.
 
-#### `GITLAB_REGISTRY_HOST`
+##### `GITLAB_REGISTRY_HOST`
 
 Sets the GitLab Registry Host. Defaults to `registry.example.com`
 
-#### `GITLAB_REGISTRY_PORT`
+##### `GITLAB_REGISTRY_PORT`
 
 Sets the GitLab Registry Port. Defaults to `443`.
 
-#### `GITLAB_REGISTRY_API_URL`
+##### `GITLAB_REGISTRY_API_URL`
 
 Sets the GitLab Registry API URL. Defaults to `http://localhost:5000`
 
-#### `GITLAB_REGISTRY_KEY_PATH`
+##### `GITLAB_REGISTRY_KEY_PATH`
 
 Sets the GitLab Registry Key Path. Defaults to `config/registry.key`
 
-#### `GITLAB_REGISTRY_DIR`
+##### `GITLAB_REGISTRY_DIR`
 
 Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry`
 
-#### `GITLAB_REGISTRY_ISSUER`
+##### `GITLAB_REGISTRY_ISSUER`
 
 Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`.
 
-#### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES`
+##### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES`
 
 Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt`
 
-#### `GITLAB_PAGES_ENABLED`
+##### `GITLAB_PAGES_ENABLED`
 
 Enables the GitLab Pages. Defaults to `false`.
 
-#### `GITLAB_PAGES_DOMAIN`
+##### `GITLAB_PAGES_DOMAIN`
 
 Sets the GitLab Pages Domain. Defaults to `example.com`
 
-#### `GITLAB_PAGES_DIR`
+##### `GITLAB_PAGES_DIR`
 
 Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages`
 
-#### `GITLAB_PAGES_PORT`
+##### `GITLAB_PAGES_PORT`
 
 Sets GitLab Pages Port that will be used in NGINX. Defaults to `80`
 
-#### `GITLAB_PAGES_HTTPS`
+##### `GITLAB_PAGES_HTTPS`
 
 Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false`
 
-#### `GITLAB_PAGES_ARTIFACTS_SERVER`
+##### `GITLAB_PAGES_ARTIFACTS_SERVER`
 
 Set to `true` to enable pages artifactsserver, enabled by default.
 
-#### `GITLAB_PAGES_ARTIFACTS_SERVER_URL`
+##### `GITLAB_PAGES_ARTIFACTS_SERVER_URL`
 
 If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No default.
 
-#### `GITLAB_PAGES_EXTERNAL_HTTP`
+##### `GITLAB_PAGES_EXTERNAL_HTTP`
 
 Sets GitLab Pages external http to receive request on an independen port. Disabled by default
 
-#### `GITLAB_PAGES_EXTERNAL_HTTPS`
+##### `GITLAB_PAGES_EXTERNAL_HTTPS`
 
 Sets GitLab Pages external https to receive request on an independen port. Disabled by default
 
-#### `GITLAB_PAGES_ACCESS_CONTROL`
+##### `GITLAB_PAGES_ACCESS_CONTROL`
 
 Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default.
 
-#### `GITLAB_PAGES_NGINX_PROXY`
+##### `GITLAB_PAGES_NGINX_PROXY`
 
 Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup.
 
-#### `GITLAB_PAGES_ACCESS_SECRET`
+##### `GITLAB_PAGES_ACCESS_SECRET`
 
 Secret Hash, minimal 32 characters, if omitted, it will be auto generated.
 
-#### `GITLAB_PAGES_ACCESS_CONTROL_SERVER`
+##### `GITLAB_PAGES_ACCESS_CONTROL_SERVER`
 
 Gitlab instance URI, example: `https://gitlab.example.io`
 
-#### `GITLAB_PAGES_ACCESS_CLIENT_ID`
+##### `GITLAB_PAGES_ACCESS_CLIENT_ID`
 
 Client ID from earlier generated OAuth application
 
-#### `GITLAB_PAGES_ACCESS_CLIENT_SECRET`
+##### `GITLAB_PAGES_ACCESS_CLIENT_SECRET`
 
 Client Secret from earlier genereated OAuth application
 
-#### `GITLAB_PAGES_ACCESS_REDIRECT_URI`
+##### `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
 Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth`
 
-#### `GITLAB_HTTPS`
+##### `GITLAB_HTTPS`
 
 Set to `true` to enable https support, disabled by default.
 
-#### `GITALY_CLIENT_PATH`
+##### `GITALY_CLIENT_PATH`
 
 Set default path for gitaly. defaults to `/home/git/gitaly`
 
-#### `GITALY_TOKEN`
+##### `GITALY_TOKEN`
 
 Set a gitaly token, blank by default.
 
-#### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL`
+##### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL`
 
 Time between sampling of unicorn socket metrics, in seconds, defaults to `10`
 
-#### `GITLAB_MONITORING_IP_WHITELIST`
+##### `GITLAB_MONITORING_IP_WHITELIST`
 
 IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8`
 
-#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED`
+##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED`
 
 Set to `true` to enable the sidekiq exporter, enabled by default.
 
-#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS`
+##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS`
 
 Sidekiq exporter address, defaults to `0.0.0.0`
 
-#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT`
+##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT`
 
 Sidekiq exporter port, defaults to `3807`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED`
+##### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED`
 
 Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default.
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY`
+##### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY`
 
 Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI`
 
 The value of the `base-uri` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC`
 
 The value of the `child-src` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC`
 
 The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC`
 
 The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC`
 
 The value of the `font-src` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION`
 
 The value of the `form-action` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS`
 
 The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC`
 
 The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC`
 
 The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC`
 
 The value of the `manifest-src` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC`
 
 The value of the `media-src` directive in the `Content-Security-Policy` header
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC`
 
 The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC`
 
 The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC`
 
 The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC`
 
 The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:`
 
-#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI`
+##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI`
 
 The value of the `report-uri` directive in the `Content-Security-Policy` header
 
-#### `SSL_SELF_SIGNED`
+##### `SSL_SELF_SIGNED`
 
 Set to `true` when using self signed ssl certificates. `false` by default.
 
-#### `SSL_CERTIFICATE_PATH`
+##### `SSL_CERTIFICATE_PATH`
 
 Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt`
 
-#### `SSL_KEY_PATH`
+##### `SSL_KEY_PATH`
 
 Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key`
 
-#### `SSL_DHPARAM_PATH`
+##### `SSL_DHPARAM_PATH`
 
 Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem`
 
-#### `SSL_VERIFY_CLIENT`
+##### `SSL_VERIFY_CLIENT`
 
 Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off`
 
-#### `SSL_CA_CERTIFICATES_PATH`
+##### `SSL_CA_CERTIFICATES_PATH`
 
 List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`.
 
-#### `SSL_REGISTRY_KEY_PATH`
+##### `SSL_REGISTRY_KEY_PATH`
 
 Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key`
 
-#### `SSL_REGISTRY_CERT_PATH`
+##### `SSL_REGISTRY_CERT_PATH`
 
 Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt`
 
-#### `SSL_PAGES_KEY_PATH`
+##### `SSL_PAGES_KEY_PATH`
 
 Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key`
 
-#### `SSL_PAGES_CERT_PATH`
+##### `SSL_PAGES_CERT_PATH`
 
 Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt`
 
-#### `SSL_CIPHERS`
+##### `SSL_CIPHERS`
 
 List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4`
 
-#### `SSL_PROTOCOLS`
+##### `SSL_PROTOCOLS`
 
 List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3`
 
-#### `SSL_PAGES_CIPHERS`
+##### `SSL_PAGES_CIPHERS`
 
 List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS`
 
-#### `SSL_PAGES_PROTOCOLS`
+##### `SSL_PAGES_PROTOCOLS`
 
 List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS`
 
-#### `SSL_REGISTRY_CIPHERS`
+##### `SSL_REGISTRY_CIPHERS`
 
 List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS`
 
-#### `SSL_REGISTRY_PROTOCOLS`
+##### `SSL_REGISTRY_PROTOCOLS`
 
 List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS`
 
-#### `NGINX_WORKERS`
+##### `NGINX_WORKERS`
 
 The number of nginx workers to start. Defaults to `1`.
 
-#### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE`
+##### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE`
 
 Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`.
 
-#### `NGINX_HSTS_ENABLED`
+##### `NGINX_HSTS_ENABLED`
 
 Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario.
 
-#### `NGINX_HSTS_MAXAGE`
+##### `NGINX_HSTS_MAXAGE`
 
 Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`.
 
-#### `NGINX_PROXY_BUFFERING`
+##### `NGINX_PROXY_BUFFERING`
 
 Enable `proxy_buffering`. Defaults to `off`.
 
-#### `NGINX_ACCEL_BUFFERING`
+##### `NGINX_ACCEL_BUFFERING`
 
 Enable `X-Accel-Buffering` header. Default to `no`
 
-#### `NGINX_X_FORWARDED_PROTO`
+##### `NGINX_X_FORWARDED_PROTO`
 
 Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`.
 
-#### `NGINX_REAL_IP_RECURSIVE`
+##### `NGINX_REAL_IP_RECURSIVE`
 
 set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default.
 
-#### `NGINX_REAL_IP_TRUSTED_ADDRESSES`
+##### `NGINX_REAL_IP_TRUSTED_ADDRESSES`
 
 You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults.
 
-#### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG`
+##### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG`
 
 Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults.
 
-#### `REDIS_HOST`
+##### `REDIS_HOST`
 
 The hostname of the redis server. Defaults to `localhost`
 
-#### `REDIS_PORT`
+##### `REDIS_PORT`
 
 The connection port of the redis server. Defaults to `6379`.
 
-#### `REDIS_DB_NUMBER`
+##### `REDIS_DB_NUMBER`
 
 The redis database number. Defaults to '0'.
 
-#### `PUMA_WORKERS`
+##### `PUMA_WORKERS`
 
 The number of puma workers to start. Defaults to `3`.
 
-#### `PUMA_TIMEOUT`
+##### `PUMA_TIMEOUT`
 
 Sets the timeout of puma worker processes. Defaults to `60` seconds.
 
-#### `PUMA_THREADS_MIN`
+##### `PUMA_THREADS_MIN`
 
 The number of puma minimum threads. Defaults to `1`.
 
-#### `PUMA_THREADS_MAX`
+##### `PUMA_THREADS_MAX`
 
 The number of puma maximum threads. Defaults to `16`.
 
-#### `PUMA_PER_WORKER_MAX_MEMORY_MB`
+##### `PUMA_PER_WORKER_MAX_MEMORY_MB`
 
 Maximum memory size of per puma worker process. Defaults to `1024`.
 
-#### `PUMA_MASTER_MAX_MEMORY_MB`
+##### `PUMA_MASTER_MAX_MEMORY_MB`
 
 Maximum memory size of puma master process. Defaults to `800`.
 
-#### `SIDEKIQ_CONCURRENCY`
+##### `SIDEKIQ_CONCURRENCY`
 
 The number of concurrent sidekiq jobs to run. Defaults to `25`
 
-#### `SIDEKIQ_SHUTDOWN_TIMEOUT`
+##### `SIDEKIQ_SHUTDOWN_TIMEOUT`
 
 Timeout for sidekiq shutdown. Defaults to `4`
 
-#### `SIDEKIQ_MEMORY_KILLER_MAX_RSS`
+##### `SIDEKIQ_MEMORY_KILLER_MAX_RSS`
 
 Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
 
-#### `GITLAB_SIDEKIQ_LOG_FORMAT`
+##### `GITLAB_SIDEKIQ_LOG_FORMAT`
 
 Sidekiq log format that will be used. Defaults to `json`
 
-#### `DB_ADAPTER`
+##### `DB_ADAPTER`
 
 The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`.
 
-#### `DB_ENCODING`
+##### `DB_ENCODING`
 
 The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively.
 
-#### `DB_HOST`
+##### `DB_HOST`
 
 The database server hostname. Defaults to `localhost`.
 
-#### `DB_PORT`
+##### `DB_PORT`
 
 The database server port. Defaults to `5432` for postgresql.
 
-#### `DB_NAME`
+##### `DB_NAME`
 
 The database database name. Defaults to `gitlabhq_production`
 
-#### `DB_USER`
+##### `DB_USER`
 
 The database database user. Defaults to `root`
 
-#### `DB_PASS`
+##### `DB_PASS`
 
 The database database password. Defaults to no password
 
-#### `DB_POOL`
+##### `DB_POOL`
 
 The database database connection pool count. Defaults to `10`.
 
-#### `DB_PREPARED_STATEMENTS`
+##### `DB_PREPARED_STATEMENTS`
 
 Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/)
 
-#### `SMTP_ENABLED`
+##### `SMTP_ENABLED`
 
 Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`.
 
-#### `SMTP_DOMAIN`
+##### `SMTP_DOMAIN`
 
 SMTP domain. Defaults to `www.gmail.com`
 
-#### `SMTP_HOST`
+##### `SMTP_HOST`
 
 SMTP server host. Defaults to `smtp.gmail.com`.
 
-#### `SMTP_PORT`
+##### `SMTP_PORT`
 
 SMTP server port. Defaults to `587`.
 
-#### `SMTP_USER`
+##### `SMTP_USER`
 
 SMTP username.
 
-#### `SMTP_PASS`
+##### `SMTP_PASS`
 
 SMTP password.
 
-#### `SMTP_STARTTLS`
+##### `SMTP_STARTTLS`
 
 Enable STARTTLS. Defaults to `true`.
 
-#### `SMTP_TLS`
+##### `SMTP_TLS`
 
 Enable SSL/TLS. Defaults to `false`.
 
-#### `SMTP_OPENSSL_VERIFY_MODE`
+##### `SMTP_OPENSSL_VERIFY_MODE`
 
 SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`.
 
-#### `SMTP_AUTHENTICATION`
+##### `SMTP_AUTHENTICATION`
 
 Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set.
 
-#### `SMTP_CA_ENABLED`
+##### `SMTP_CA_ENABLED`
 
 Enable custom CA certificates for SMTP email configuration. Defaults to `false`.
 
-#### `SMTP_CA_PATH`
+##### `SMTP_CA_PATH`
 
 Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`.
 
-#### `SMTP_CA_FILE`
+##### `SMTP_CA_FILE`
 
 Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`.
 
-#### `IMAP_ENABLED`
+##### `IMAP_ENABLED`
 
 Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`.
 
-#### `IMAP_HOST`
+##### `IMAP_HOST`
 
 IMAP server host. Defaults to `imap.gmail.com`.
 
-#### `IMAP_PORT`
+##### `IMAP_PORT`
 
 IMAP server port. Defaults to `993`.
 
-#### `IMAP_USER`
+##### `IMAP_USER`
 
 IMAP username.
 
-#### `IMAP_PASS`
+##### `IMAP_PASS`
 
 IMAP password.
 
-#### `IMAP_SSL`
+##### `IMAP_SSL`
 
 Enable SSL. Defaults to `true`.
 
-#### `IMAP_STARTTLS`
+##### `IMAP_STARTTLS`
 
 Enable STARTSSL. Defaults to `false`.
 
-#### `IMAP_MAILBOX`
+##### `IMAP_MAILBOX`
 
 The name of the mailbox where incoming mail will end up. Defaults to `inbox`.
 
-#### `LDAP_ENABLED`
+##### `LDAP_ENABLED`
 
 Enable LDAP. Defaults to `false`
 
-#### `LDAP_LABEL`
+##### `LDAP_LABEL`
 
 Label to show on login tab for LDAP server. Defaults to 'LDAP'
 
-#### `LDAP_HOST`
+##### `LDAP_HOST`
 
 LDAP Host
 
-#### `LDAP_PORT`
+##### `LDAP_PORT`
 
 LDAP Port. Defaults to `389`
 
-#### `LDAP_UID`
+##### `LDAP_UID`
 
 LDAP UID. Defaults to `sAMAccountName`
 
-#### `LDAP_METHOD`
+##### `LDAP_METHOD`
 
 LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain`
 
-#### `LDAP_VERIFY_SSL`
+##### `LDAP_VERIFY_SSL`
 
 LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true`
 
-#### `LDAP_CA_FILE`
+##### `LDAP_CA_FILE`
 
 Specifies the path to a file containing a PEM-format CA certificate. Defaults to ``
 
-#### `LDAP_SSL_VERSION`
+##### `LDAP_SSL_VERSION`
 
 Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to ``
 
-#### `LDAP_BIND_DN`
+##### `LDAP_BIND_DN`
 
 No default.
 
-#### `LDAP_PASS`
+##### `LDAP_PASS`
 
 LDAP password
 
-#### `LDAP_TIMEOUT`
+##### `LDAP_TIMEOUT`
 
 Timeout, in seconds, for LDAP queries. Defaults to `10`.
 
-#### `LDAP_ACTIVE_DIRECTORY`
+##### `LDAP_ACTIVE_DIRECTORY`
 
 Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`,
 
-#### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN`
+##### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN`
 
 If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`.
 
-#### `LDAP_BLOCK_AUTO_CREATED_USERS`
+##### `LDAP_BLOCK_AUTO_CREATED_USERS`
 
 Locks down those users until they have been cleared by the admin. Defaults to `false`.
 
-#### `LDAP_BASE`
+##### `LDAP_BASE`
 
 Base where we can search for users. No default.
 
-#### `LDAP_USER_FILTER`
+##### `LDAP_USER_FILTER`
 
 Filter LDAP users. No default.
 
-#### `LDAP_USER_ATTRIBUTE_USERNAME`
+##### `LDAP_USER_ATTRIBUTE_USERNAME`
 
 Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']`
 
-#### `LDAP_USER_ATTRIBUTE_MAIL`
+##### `LDAP_USER_ATTRIBUTE_MAIL`
 
 Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']`
 
-#### `LDAP_USER_ATTRIBUTE_NAME`
+##### `LDAP_USER_ATTRIBUTE_NAME`
 
 Attribute field for the used username of a user. Default to `cn`.
 
-#### `LDAP_USER_ATTRIBUTE_FIRSTNAME`
+##### `LDAP_USER_ATTRIBUTE_FIRSTNAME`
 
 Attribute field for the forename of a user. Default to `givenName`
 
-#### `LDAP_USER_ATTRIBUTE_LASTNAME`
+##### `LDAP_USER_ATTRIBUTE_LASTNAME`
 
  Attribute field for the surname of a user. Default to `sn`
 
-#### `LDAP_LOWERCASE_USERNAMES`
+##### `LDAP_LOWERCASE_USERNAMES`
 
 GitLab will lower case the username for the LDAP Server. Defaults to `false`
 
-#### `LDAP_PREVENT_LDAP_SIGN_IN`
+##### `LDAP_PREVENT_LDAP_SIGN_IN`
 
 Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), defaults to `false`
 
-#### `OAUTH_ENABLED`
+##### `OAUTH_ENABLED`
 
 Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`.
 
-#### `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER`
+##### `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER`
 
 Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
 
-#### `OAUTH_ALLOW_SSO`
+##### `OAUTH_ALLOW_SSO`
 
 Comma separated list of oauth providers for single sign-on. This allows users to login without having a user account. The account is created automatically when authentication is successful. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
 
-#### `OAUTH_BLOCK_AUTO_CREATED_USERS`
+##### `OAUTH_BLOCK_AUTO_CREATED_USERS`
 
 Locks down those users until they have been cleared by the admin. Defaults to `true`.
 
-#### `OAUTH_AUTO_LINK_LDAP_USER`
+##### `OAUTH_AUTO_LINK_LDAP_USER`
 
 Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`.
 
-#### `OAUTH_AUTO_LINK_SAML_USER`
+##### `OAUTH_AUTO_LINK_SAML_USER`
 
 Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`.
 
-#### `OAUTH_AUTO_LINK_USER`
+##### `OAUTH_AUTO_LINK_USER`
 
 Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`.
 
-#### `OAUTH_EXTERNAL_PROVIDERS`
+##### `OAUTH_EXTERNAL_PROVIDERS`
 
 Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
 
-#### `OAUTH_CAS3_LABEL`
+##### `OAUTH_CAS3_LABEL`
 
 The "Sign in with" button label. Defaults to "cas3".
 
-#### `OAUTH_CAS3_SERVER`
+##### `OAUTH_CAS3_SERVER`
 
 CAS3 server URL. No defaults.
 
-#### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION`
+##### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION`
 
 Disable CAS3 SSL verification. Defaults to `false`.
 
-#### `OAUTH_CAS3_LOGIN_URL`
+##### `OAUTH_CAS3_LOGIN_URL`
 
 CAS3 login URL. Defaults to `/cas/login`
 
-#### `OAUTH_CAS3_VALIDATE_URL`
+##### `OAUTH_CAS3_VALIDATE_URL`
 
 CAS3 validation URL. Defaults to `/cas/p3/serviceValidate`
 
-#### `OAUTH_CAS3_LOGOUT_URL`
+##### `OAUTH_CAS3_LOGOUT_URL`
 
 CAS3 logout URL. Defaults to `/cas/logout`
 
-#### `OAUTH_GOOGLE_API_KEY`
+##### `OAUTH_GOOGLE_API_KEY`
 
 Google App Client ID. No defaults.
 
-#### `OAUTH_GOOGLE_APP_SECRET`
+##### `OAUTH_GOOGLE_APP_SECRET`
 
 Google App Client Secret. No defaults.
 
-#### `OAUTH_GOOGLE_RESTRICT_DOMAIN`
+##### `OAUTH_GOOGLE_RESTRICT_DOMAIN`
 
 List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults.
 
-#### `OAUTH_FACEBOOK_API_KEY`
+##### `OAUTH_FACEBOOK_API_KEY`
 
 Facebook App API key. No defaults.
 
-#### `OAUTH_FACEBOOK_APP_SECRET`
+##### `OAUTH_FACEBOOK_APP_SECRET`
 
 Facebook App API secret. No defaults.
 
-#### `OAUTH_TWITTER_API_KEY`
+##### `OAUTH_TWITTER_API_KEY`
 
 Twitter App API key. No defaults.
 
-#### `OAUTH_TWITTER_APP_SECRET`
+##### `OAUTH_TWITTER_APP_SECRET`
 
 Twitter App API secret. No defaults.
 
-#### `OAUTH_AUTHENTIQ_CLIENT_ID`
+##### `OAUTH_AUTHENTIQ_CLIENT_ID`
 
 authentiq Client ID. No defaults.
 
-#### `OAUTH_AUTHENTIQ_CLIENT_SECRET`
+##### `OAUTH_AUTHENTIQ_CLIENT_SECRET`
 
 authentiq Client secret. No defaults.
 
-#### `OAUTH_AUTHENTIQ_SCOPE`
+##### `OAUTH_AUTHENTIQ_SCOPE`
 
 Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'`
 
-#### `OAUTH_AUTHENTIQ_REDIRECT_URI`
+##### `OAUTH_AUTHENTIQ_REDIRECT_URI`
 
  Callback URL for Authentiq. No defaults.
 
-#### `OAUTH_GITHUB_API_KEY`
+##### `OAUTH_GITHUB_API_KEY`
 
 GitHub App Client ID. No defaults.
 
-#### `OAUTH_GITHUB_APP_SECRET`
+##### `OAUTH_GITHUB_APP_SECRET`
 
 GitHub App Client secret. No defaults.
 
-#### `OAUTH_GITHUB_URL`
+##### `OAUTH_GITHUB_URL`
 
 Url to the GitHub Enterprise server. Defaults to `https://github.com`
 
-#### `OAUTH_GITHUB_VERIFY_SSL`
+##### `OAUTH_GITHUB_VERIFY_SSL`
 
 Enable SSL verification while communicating with the GitHub server. Defaults to `true`.
 
-#### `OAUTH_GITLAB_API_KEY`
+##### `OAUTH_GITLAB_API_KEY`
 
 GitLab App Client ID. No defaults.
 
-#### `OAUTH_GITLAB_APP_SECRET`
+##### `OAUTH_GITLAB_APP_SECRET`
 
 GitLab App Client secret. No defaults.
 
-#### `OAUTH_BITBUCKET_API_KEY`
+##### `OAUTH_BITBUCKET_API_KEY`
 
 BitBucket App Client ID. No defaults.
 
-#### `OAUTH_BITBUCKET_APP_SECRET`
+##### `OAUTH_BITBUCKET_APP_SECRET`
 
 BitBucket App Client secret. No defaults.
 
-#### `OAUTH_BITBUCKET_URL`
+##### `OAUTH_BITBUCKET_URL`
 
 Bitbucket URL. Defaults: `https://bitbucket.org/`
 
-#### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL`
+##### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL`
 
 The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`.
 
-#### `OAUTH_SAML_IDP_CERT_FINGERPRINT`
+##### `OAUTH_SAML_IDP_CERT_FINGERPRINT`
 
 The SHA1 fingerprint of the certificate. No Defaults.
 
-#### `OAUTH_SAML_IDP_SSO_TARGET_URL`
+##### `OAUTH_SAML_IDP_SSO_TARGET_URL`
 
 The URL to which the authentication request should be sent. No defaults.
 
-#### `OAUTH_SAML_ISSUER`
+##### `OAUTH_SAML_ISSUER`
 
 The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`.
 
-#### `OAUTH_SAML_LABEL`
+##### `OAUTH_SAML_LABEL`
 
 The "Sign in with" button label. Defaults to "Our SAML Provider".
 
-#### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT`
+##### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT`
 
 Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient`
 
-#### `OAUTH_SAML_GROUPS_ATTRIBUTE`
+##### `OAUTH_SAML_GROUPS_ATTRIBUTE`
 
 Map groups attribute in a SAMLResponse to external groups. No defaults.
 
-#### `OAUTH_SAML_EXTERNAL_GROUPS`
+##### `OAUTH_SAML_EXTERNAL_GROUPS`
 
 List of external groups in a SAMLResponse. Value is comma separated list of single quoted groups. Example: `'group1','group2'`. No defaults.
 
-#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL`
+##### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL`
 
 Map 'email' attribute name in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
 
-#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
+##### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
 
 Map 'username' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
 
-#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME`
+##### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME`
 
 Map 'name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
 
-#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME`
+##### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME`
 
 Map 'first_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
 
-#### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME`
+##### `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME`
 
 Map 'last_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details.
 
-#### `OAUTH_CROWD_SERVER_URL`
+##### `OAUTH_CROWD_SERVER_URL`
 
 Crowd server url. No defaults.
 
-#### `OAUTH_CROWD_APP_NAME`
+##### `OAUTH_CROWD_APP_NAME`
 
 Crowd server application name. No defaults.
 
-#### `OAUTH_CROWD_APP_PASSWORD`
+##### `OAUTH_CROWD_APP_PASSWORD`
 
 Crowd server application password. No defaults.
 
-#### `OAUTH_AUTH0_CLIENT_ID`
+##### `OAUTH_AUTH0_CLIENT_ID`
 
 Auth0 Client ID. No defaults.
 
-#### `OAUTH_AUTH0_CLIENT_SECRET`
+##### `OAUTH_AUTH0_CLIENT_SECRET`
 
 Auth0 Client secret. No defaults.
 
-#### `OAUTH_AUTH0_DOMAIN`
+##### `OAUTH_AUTH0_DOMAIN`
 
 Auth0 Domain. No defaults.
 
-#### `OAUTH_AUTH0_SCOPE`
+##### `OAUTH_AUTH0_SCOPE`
 
 Auth0 Scope. Defaults to `openid profile email`.
 
-#### `OAUTH_AZURE_API_KEY`
+##### `OAUTH_AZURE_API_KEY`
 
 Azure Client ID. No defaults.
 
-#### `OAUTH_AZURE_API_SECRET`
+##### `OAUTH_AZURE_API_SECRET`
 
 Azure Client secret. No defaults.
 
-#### `OAUTH_AZURE_TENANT_ID`
+##### `OAUTH_AZURE_TENANT_ID`
 
 Azure Tenant ID. No defaults.
 
-#### `OAUTH2_GENERIC_APP_ID`
+##### `OAUTH2_GENERIC_APP_ID`
 
 Your OAuth2 App ID. No defaults.
 
-#### `OAUTH2_GENERIC_APP_SECRET`
+##### `OAUTH2_GENERIC_APP_SECRET`
 
 Your OAuth2 App Secret. No defaults.
 
-#### `OAUTH2_GENERIC_CLIENT_SITE`
+##### `OAUTH2_GENERIC_CLIENT_SITE`
 
 The OAuth2 generic client site. No defaults
 
-#### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`
+##### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`
 
 The OAuth2 generic client user info url. No defaults
 
-#### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`
+##### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`
 
 The OAuth2 generic client authorize url. No defaults
 
-#### `OAUTH2_GENERIC_CLIENT_TOKEN_URL`
+##### `OAUTH2_GENERIC_CLIENT_TOKEN_URL`
 
 The OAuth2 generic client token url. No defaults
 
-#### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`
+##### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`
 
 The OAuth2 generic client end session endpoint. No defaults
 
-#### `OAUTH2_GENERIC_ID_PATH`
+##### `OAUTH2_GENERIC_ID_PATH`
 
 The OAuth2 generic id path. No defaults
 
-#### `OAUTH2_GENERIC_USER_UID`
+##### `OAUTH2_GENERIC_USER_UID`
 
 The OAuth2 generic user id path. No defaults
 
-#### `OAUTH2_GENERIC_USER_NAME`
+##### `OAUTH2_GENERIC_USER_NAME`
 
 The OAuth2 generic user name. No defaults
 
-#### `OAUTH2_GENERIC_USER_EMAIL`
+##### `OAUTH2_GENERIC_USER_EMAIL`
 
 The OAuth2 generic user email. No defaults
 
-#### `OAUTH2_GENERIC_NAME`
+##### `OAUTH2_GENERIC_NAME`
 
 The name of your OAuth2 provider. No defaults
 
-#### `GITLAB_GRAVATAR_ENABLED`
+##### `GITLAB_GRAVATAR_ENABLED`
 
 Enables gravatar integration. Defaults to `true`.
 
-#### `GITLAB_GRAVATAR_HTTP_URL`
+##### `GITLAB_GRAVATAR_HTTP_URL`
 
 Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html).
 
-#### `GITLAB_GRAVATAR_HTTPS_URL`
+##### `GITLAB_GRAVATAR_HTTPS_URL`
 
 Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`.
 
-#### `USERMAP_UID`
+##### `USERMAP_UID`
 
 Sets the uid for user `git` to the specified uid. Defaults to `1000`.
 
-#### `USERMAP_GID`
+##### `USERMAP_GID`
 
 Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`.
 
-#### `GOOGLE_ANALYTICS_ID`
+##### `GOOGLE_ANALYTICS_ID`
 
 Google Analytics ID. No defaults.
 
-#### `PIWIK_URL`
+##### `PIWIK_URL`
 
 Sets the Piwik URL. No defaults.
 
-#### `PIWIK_SITE_ID`
+##### `PIWIK_SITE_ID`
 
 Sets the Piwik site ID. No defaults.
 
-#### `AWS_BACKUPS`
+##### `AWS_BACKUPS`
 
 Enables automatic uploads to an Amazon S3 instance. Defaults to `false`.
 
-#### `AWS_BACKUP_REGION`
+##### `AWS_BACKUP_REGION`
 
 AWS region. No defaults.
 
-#### `AWS_BACKUP_ENDPOINT`
+##### `AWS_BACKUP_ENDPOINT`
 
 AWS endpoint. No defaults.
 
-#### `AWS_BACKUP_ACCESS_KEY_ID`
+##### `AWS_BACKUP_ACCESS_KEY_ID`
 
 AWS access key id. No defaults.
 
-#### `AWS_BACKUP_SECRET_ACCESS_KEY`
+##### `AWS_BACKUP_SECRET_ACCESS_KEY`
 
 AWS secret access key. No defaults.
 
-#### `AWS_BACKUP_BUCKET`
+##### `AWS_BACKUP_BUCKET`
 
 AWS bucket for backup uploads. No defaults.
 
-#### `AWS_BACKUP_MULTIPART_CHUNK_SIZE`
+##### `AWS_BACKUP_MULTIPART_CHUNK_SIZE`
 
 Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html)
 
-#### `AWS_BACKUP_ENCRYPTION`
+##### `AWS_BACKUP_ENCRYPTION`
 
 Turns on AWS Server-Side Encryption.  Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html)
 
-#### `AWS_BACKUP_STORAGE_CLASS`
+##### `AWS_BACKUP_STORAGE_CLASS`
 
 Configure the storage class for the item. Defaults to `STANDARD`  See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html)
 
-#### `AWS_BACKUP_SIGNATURE_VERSION`
+##### `AWS_BACKUP_SIGNATURE_VERSION`
 
 Configure the storage signature version. Defaults to `4`  See at [AWS S3 Docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version)
 
-#### `GCS_BACKUPS`
+##### `GCS_BACKUPS`
 
 Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`.
 
-#### `GCS_BACKUP_ACCESS_KEY_ID`
+##### `GCS_BACKUP_ACCESS_KEY_ID`
 
 GCS access key id. No defaults
 
-#### `GCS_BACKUP_SECRET_ACCESS_KEY`
+##### `GCS_BACKUP_SECRET_ACCESS_KEY`
 
 GCS secret access key. No defaults
 
-#### `GCS_BACKUP_BUCKET`
+##### `GCS_BACKUP_BUCKET`
 
 GCS bucket for backup uploads. No defaults
 
-#### `GITLAB_ROBOTS_PATH`
+##### `GITLAB_ROBOTS_PATH`
 
 Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples.
 
-#### `RACK_ATTACK_ENABLED`
+##### `RACK_ATTACK_ENABLED`
 
 Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`.
 
-#### `RACK_ATTACK_WHITELIST`
+##### `RACK_ATTACK_WHITELIST`
 
 Always allow requests from whitelisted host. Defaults to `127.0.0.1`
 
-#### `RACK_ATTACK_MAXRETRY`
+##### `RACK_ATTACK_MAXRETRY`
 
 Number of failed auth attempts before which an IP should be banned. Defaults to `10`
 
-#### `RACK_ATTACK_FINDTIME`
+##### `RACK_ATTACK_FINDTIME`
 
 Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`.
 
-#### `RACK_ATTACK_BANTIME`
+##### `RACK_ATTACK_BANTIME`
 
 Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`.
 
-#### `GITLAB_WORKHORSE_TIMEOUT`
+##### `GITLAB_WORKHORSE_TIMEOUT`
 
 Timeout for gitlab workhorse http proxy. Defaults to `5m0s`.
 
-#### `SENTRY_ENABLED`
+##### `SENTRY_ENABLED`
 
 Enables Error Reporting and Logging with Sentry. Defaults to `false`.
 
-#### `SENTRY_DSN`
+##### `SENTRY_DSN`
 
 Sentry DSN. No defaults.
 
-#### `SENTRY_CLIENTSIDE_DSN`
+##### `SENTRY_CLIENTSIDE_DSN`
 
 Sentry clientside DSN. No defaults.
 
-#### `SENTRY_ENVIRONMENT`
+##### `SENTRY_ENVIRONMENT`
 
 Sentry environment. Defaults to `production`.
 
-### Docker secrets and configs
+#### Docker secrets and configs
 
 All the above environment variables can be put into a [secrets](https://docs.docker.com/compose/compose-file/#secrets) or [config](https://docs.docker.com/compose/compose-file/#configs) file
 and then both docker-compose and Docker Swarm can import them into your gitlab container.
@@ -2335,9 +2335,9 @@ keys [`gitlab-configs`](contrib/docker-swarm/docker-compose.yml#L158) and
 
 If you're not using one of these files, then don't include its entry in the docker-compose file.
 
-# Maintenance
+## Maintenance
 
-## Creating backups
+### Creating backups
 
 GitLab defines a rake task to take a backup of your gitlab installation. The backup consists of all git repositories, uploaded files and as you might expect, the sql database.
 
@@ -2371,7 +2371,7 @@ Afterwards you can bring your Instance back with the following command:
 docker-compose up -d
 ```
 
-## Restoring Backups
+### Restoring Backups
 
 GitLab also defines a rake task to restore a backup.
 
@@ -2412,13 +2412,13 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b
 docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493
 ```
 
-## Host Key Backups (ssh)
+### Host Key Backups (ssh)
 
 SSH keys are not backed up in the normal gitlab backup process. You
 will need to backup the `ssh/` directory in the data volume by hand
 and you will want to restore it prior to doing a gitlab restore.
 
-## Automated Backups
+### Automated Backups
 
 The image can be configured to automatically take backups `daily`, `weekly` or `monthly` using the `GITLAB_BACKUP_SCHEDULE` configuration option.
 
@@ -2426,7 +2426,7 @@ Daily backups are created at `GITLAB_BACKUP_TIME` which defaults to `04:00` ever
 
 By default, when automated backups are enabled, backups are held for a period of 7 days. While when automated backups are disabled, the backups are held for an infinite period of time. This behavior can be configured via the `GITLAB_BACKUP_EXPIRY` option.
 
-### Amazon Web Services (AWS) Remote Backups
+#### Amazon Web Services (AWS) Remote Backups
 
 The image can be configured to automatically upload the backups to an AWS S3 bucket. To enable automatic AWS backups first add `--env 'AWS_BACKUPS=true'` to the docker run command. In addition `AWS_BACKUP_REGION` and `AWS_BACKUP_BUCKET` must be properly configured to point to the desired AWS location. Finally an IAM user must be configured with appropriate access permission and their AWS keys exposed through `AWS_BACKUP_ACCESS_KEY_ID` and `AWS_BACKUP_SECRET_ACCESS_KEY`.
 
@@ -2436,7 +2436,7 @@ For remote backup to selfhosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT`
 
 AWS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed.
 
-### Google Cloud Storage (GCS) Remote Backups
+#### Google Cloud Storage (GCS) Remote Backups
 
 The image can be configured to automatically upload the backups to an Google Cloud Storage bucket. To enable automatic GCS backups first add `--env 'GCS_BACKUPS=true'` to the docker run command. In addition `GCS_BACKUP_BUCKET` must be properly configured to point to the desired GCS location.
 Finally a couple of `Interoperable storage access keys` user must be created and their keys exposed through `GCS_BACKUP_ACCESS_KEY_ID` and `GCS_BACKUP_SECRET_ACCESS_KEY`.
@@ -2445,7 +2445,7 @@ More details about the Cloud storage interoperability  properties can found on [
 
 GCS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed.
 
-## Rake Tasks
+### Rake Tasks
 
 The `app:rake` command allows you to run gitlab rake tasks. To run a rake task simply specify the task to be executed to the `app:rake` command. For example, if you want to gather information about GitLab and the system it runs on.
 
@@ -2480,16 +2480,16 @@ For a complete list of available rake tasks please refer <https://github.com/git
 To use the `app:rake` command with `docker-compose` use the following command.
 
 ```bash
-# For stopped instances
+## For stopped instances
 docker-compose run --rm gitlab app:rake gitlab:env:info
 docker-compose run --rm gitlab app:rake gitlab:import:repos
 
-# For running instances
+## For running instances
 docker-compose exec --user git gitlab bundle exec rake gitlab:env:info RAILS_ENV=production
 docker-compose exec gitlab sudo -HEu git bundle exec rake gitlab:import:repos RAILS_ENV=production
 ```
 
-## Import Repositories
+### Import Repositories
 
 Copy all the **bare** git repositories to the `repositories/` directory of the [data store](#data-store) and execute the `gitlab:import:repos` rake task like so:
 
@@ -2503,7 +2503,7 @@ Watch the logs and your repositories should be available into your new gitlab co
 See [Rake Tasks](#rake-tasks) for more information on executing rake tasks.
 Usage when using `docker-compose` can also be found there.
 
-## Upgrading
+### Upgrading
 
 > **Important Notice**
 >
@@ -2552,7 +2552,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1
 ```
 
-## Shell Access
+### Shell Access
 
 For debugging and maintenance purposes you may want access the containers shell. If you are using docker version `1.3.0` or higher you can access a running containers shell using `docker exec` command.
 
@@ -2560,7 +2560,7 @@ For debugging and maintenance purposes you may want access the containers shell.
 docker exec -it gitlab bash
 ```
 
-# Monitoring
+## Monitoring
 
 You can monitor your GitLab instance status as described in the [official documentation](https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html), for example:
 
@@ -2578,7 +2578,7 @@ On success, the endpoint will return a `200` HTTP status code, and a response li
 
 To do that you will need to set the environment variable `GITLAB_MONITORING_IP_WHITELIST` to allow your IP or subnet to make requests to your GitLab instance.
 
-## Health Check
+### Health Check
 
 You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks:
 
@@ -2602,7 +2602,7 @@ Then you will be able to consult the healthcheck log by executing:
 docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq
 ```
 
-# References
+## References
 
 - <https://github.com/gitlabhq/gitlabhq>
 - <https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md>

From b0b39d965e4deeab0080d7caccdc9ea041865c41 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 27 Mar 2022 11:14:33 +0200
Subject: [PATCH 0734/1124] Fix emphasis used instead of headings

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cd8347326..cf4409f07 100644
--- a/README.md
+++ b/README.md
@@ -236,7 +236,7 @@ docker run --name gitlab -d \
 
 GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL.
 
-*Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL*
+*Note:* GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL
 
 #### PostgreSQL
 
@@ -256,7 +256,7 @@ Additionally since GitLab `8.6.0` the `pg_trgm` extension should also be loaded
 
 We are now ready to start the GitLab application.
 
-*Assuming that the PostgreSQL server host is 192.168.1.100*
+*Note:* The following applies assuming that the PostgreSQL server host is `192.168.1.100`.
 
 ```bash
 docker run --name gitlab -d \
@@ -342,7 +342,7 @@ The internal redis server has been removed from the image. Please use a [linked
 
 The image can be configured to use an external redis server. The configuration should be specified using environment variables while starting the GitLab image.
 
-*Assuming that the redis server host is 192.168.1.100*
+*Note:* The following applies assuming that the redis server host is `192.168.1.100`.
 
 ```bash
 docker run --name gitlab -it --rm \

From def7ef5fea0685efcc4ecd08456a91e09bbcf485 Mon Sep 17 00:00:00 2001
From: AlpsTsui <alps@highyouth.com>
Date: Sat, 26 Feb 2022 11:13:19 +0800
Subject: [PATCH 0735/1124] Fix: HealthCheck Script will Fail if the ENV
 GITLAB_HTTPS set True

---
 assets/runtime/functions | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8d1ca5ecc..2b841e0bc 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1641,9 +1641,13 @@ update_ssh_listen_port() {
 generate_healthcheck_script() {
   # configure healthcheck script
   ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html
+  local HEALTHCHECK_PROTOCOL="http"
+  if [[ "${GITLAB_HTTPS}" == true ]]; then
+    HEALTHCHECK_PROTOCOL="${HEALTHCHECK_PROTOCOL}s"
+  fi
 cat > /usr/local/sbin/healthcheck <<EOF
 #!/bin/bash
-url=http://localhost${GITLAB_RELATIVE_URL_ROOT}/-/liveness
+url=${HEALTHCHECK_PROTOCOL}://localhost${GITLAB_RELATIVE_URL_ROOT}/-/liveness
 options=( '--insecure' '--location' '--silent' )
 curl "\${options[@]}" \$url
 [[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]

From f1dceebf993acd1aaa07c4cffeb0b331bc1b328b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 31 Mar 2022 19:40:23 +0200
Subject: [PATCH 0736/1124] Upgrade GitLab CE to 14.9.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 02d26e8b9..39b452ae7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.9.2**
+- gitlab: upgrade CE to v14.9.2
+- gitaly: upgrade to v14.9.2
+- gitlab-pages: upgrade to v1.56.1
+
 **14.9.1**
 - gitlab: upgrade CE to v14.9.1
 - gitaly: upgrade to v14.9.1
diff --git a/Dockerfile b/Dockerfile
index 63b4fa7b5..b5ef2b31e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220316
 
-ARG VERSION=14.9.1
+ARG VERSION=14.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
     GOLANG_VERSION=1.17.8 \
     GITLAB_SHELL_VERSION=13.24.0 \
-    GITLAB_PAGES_VERSION=1.56.0 \
-    GITALY_SERVER_VERSION=14.9.1 \
+    GITLAB_PAGES_VERSION=1.56.1 \
+    GITALY_SERVER_VERSION=14.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index cf4409f07..b73943378 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.9.1
+# sameersbn/gitlab:14.9.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.1
+docker pull sameersbn/gitlab:14.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.9.1
+ sameersbn/gitlab:14.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.9.1
+    sameersbn/gitlab:14.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:sanitize
+    sameersbn/gitlab:14.9.2 app:sanitize
 ```
 
 #### Piwik
@@ -2351,7 +2351,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2386,14 +2386,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake db:setup
+    sameersbn/gitlab:14.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2402,7 +2402,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2451,7 +2451,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2464,7 +2464,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2495,7 +2495,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2519,12 +2519,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.1
+docker pull sameersbn/gitlab:14.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2549,7 +2549,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.2
 ```
 
 ### Shell Access
@@ -2587,7 +2587,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e1bac7955..0a73f9bb0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.1
+14.9.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 909d19a70..c5f377260 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 5b1015d57..ebc00a6dd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d64f7f270..f7e061b43 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5392409ca..36fd9d5c7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.1
+docker pull sameersbn/gitlab:14.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.9.1
+sameersbn/gitlab:14.9.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index dbcce41da..fff7a7431 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f3acf4fbc..57ab80f72 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.1
+    image: sameersbn/gitlab:14.9.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c3276b888..dad8f4a4a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.9.1
+        image: sameersbn/gitlab:14.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 86a329086a9bf29937da7dc87e8e376b89c28352 Mon Sep 17 00:00:00 2001
From: Poppo <giuseppe.arancio@sparkfabrik.com>
Date: Fri, 8 Apr 2022 17:10:45 +0200
Subject: [PATCH 0737/1124] refs
 https://github.com/sameersbn/docker-gitlab/issues/2538: Fix Variables for
 UPLOADS in GCP

---
 assets/runtime/config/gitlabhq/gitlab.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 8b6deb602..08f828f4a 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -314,9 +314,9 @@ production: &base
         path_style: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
         #end-uploads-aws
         #start-uploads-gcs
-        google_project: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
-        google_client_email: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
-        google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        google_project: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
         #end-uploads-gcs
 
   ## Packages (maven repository, npm registry, etc...)

From 4752be956c9513f31381c196fef748eeba25f903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= <peter.jozsa@icloud.com>
Date: Mon, 11 Apr 2022 12:13:09 +0200
Subject: [PATCH 0738/1124] Allow to configure terraform state feature

---
 README.md                                 | 56 +++++++++++++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml | 31 ++++++++-----
 assets/runtime/env-defaults               | 22 +++++++++
 assets/runtime/functions                  | 42 +++++++++++++++++
 4 files changed, 139 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b73943378..9d4305cbe 100644
--- a/README.md
+++ b/README.md
@@ -1218,6 +1218,62 @@ Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIE
 
 Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
 
+##### `GITLAB_TERRAFORM_STATE_ENABLED`
+
+Enable/Disable Terraform State support. Defaults to `true`.
+
+##### `GITLAB_TERRAFORM_STATE_STORAGE_PATH`
+
+Directory to store the terraform state data. Defaults to `$GITLAB_SHARED_DIR/terraform_state`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED`
+
+Enables Object Store for Terraform state that will be remote stored. Defaults to `false`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY`
+
+Bucket name to store the Terraform state. Defaults to `terraform_state`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER`
+
+Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
+
+AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY`
+
+AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION`
+
+AWS Region. Defaults to `$AWS_REGION`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST`
+
+Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
+
+AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
+
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`
+
+##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`
+
+Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)
+
 ##### `GITLAB_UPLOADS_STORAGE_PATH`
 
 The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 8b6deb602..291ff0c71 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -371,21 +371,28 @@ production: &base
 
   ## Terraform state
   terraform_state:
-    enabled: true
+    enabled: {{GITLAB_TERRAFORM_STATE_ENABLED}}
     # The location where Terraform state files are stored (default: shared/terraform_state).
-    # storage_path: shared/terraform_state
+    storage_path: {{GITLAB_TERRAFORM_STATE_STORAGE_PATH}}
     object_store:
-      enabled: false
-      remote_directory: terraform_state # The bucket name
+      enabled: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED}}
+      remote_directory: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name
       connection:
-        provider: AWS
-        aws_access_key_id: AWS_ACCESS_KEY_ID
-        aws_secret_access_key: AWS_SECRET_ACCESS_KEY
-        region: us-east-1
-        # host: 'localhost' # default: s3.amazonaws.com
-        # endpoint: 'http://127.0.0.1:9000' # default: nil
-        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
-        # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+        provider: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}}
+        #start-terraform_state-aws
+        aws_access_key_id: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}}
+        aws_secret_access_key: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}}
+        region: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION}}
+        host: '{{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com
+        endpoint: '{{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil
+        aws_signature_version: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4.
+        path_style: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+        #end-terraform_state-aws
+        #start-terraform_state-gcs
+        google_project: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
+        google_client_email: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
+        google_json_key_location: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
+        #end-terraform_state-aws
 
   ## GitLab Pages
   pages:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 603d4bbc3..f2d25e6ac 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -171,6 +171,28 @@ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
 GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
 
+## TERRAFORM STATE
+GITLAB_TERRAFORM_STATE_ENABLED=${GITLAB_TERRAFORM_STATE_ENABLED:-true}
+GITLAB_TERRAFORM_STATE_STORAGE_PATH="${GITLAB_TERRAFORM_STATE_STORAGE_PATH:-$GITLAB_SHARED_DIR/terraform_state}"
+
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED:-false}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
+
+# TERRAFORM STATE:AWS
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION}
+
+# TERRAFORM STATE:Google
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}
+
 ## Cron Jobs
 GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"}
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index e15f504f5..b67fd248c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1068,6 +1068,47 @@ gitlab_configure_packages() {
     GITLAB_PACKAGES_DIR
 }
 
+gitlab_configure_terraform_state() {
+  if [[ ${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED} == true ]]; then
+    echo "Configuring gitlab::terraform_state:object_store"
+
+    if [[ "${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then
+        echo " -> Google TERRAFORM STATE provider selected removing aws config"
+        exec_as_git sed -i "/#start-terraform_state-aws/,/#end-terraform_state-aws/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#start-terraform_state-gcs/d" ${GITLAB_CONFIG}
+        exec_as_git sed -i "/#end-terraform_state-gcs/d" ${GITLAB_CONFIG}
+    fi
+    if [[ "${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then
+      echo " -> AWS TERRAFORM STATE provider selected removing Google config"
+      exec_as_git sed -i "/#start-terraform_state-gcs/,/#end-terraform_state-gcs/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#start-terraform_state-aws/d" ${GITLAB_CONFIG}
+      exec_as_git sed -i "/#end-terraform_state-aws/d" ${GITLAB_CONFIG}
+    fi
+
+    update_template ${GITLAB_CONFIG} \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \
+      GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION
+  else
+    exec_as_git sed -i -e "/storage_path: {{GITLAB_TERRAFORM_STATE_STORAGE_PATH}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG}
+  fi
+
+  echo "Configuring gitlab::terraform_state..."
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_TERRAFORM_STATE_ENABLED \
+    GITLAB_TERRAFORM_STATE_STORAGE_PATH
+}
+
 gitlab_configure_lfs() {
   if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::lfs:object_store"
@@ -1801,6 +1842,7 @@ configure_gitlab() {
   gitlab_configure_ci
   gitlab_configure_artifacts
   gitlab_configure_packages
+  gitlab_configure_terraform_state
   gitlab_configure_lfs
   gitlab_configure_uploads
   gitlab_configure_mattermost

From 7374743a0faf2fcbb76ae15cd44fb3f2bf060250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= <peter.jozsa@icloud.com>
Date: Mon, 11 Apr 2022 11:36:15 +0200
Subject: [PATCH 0739/1124] fix wrong footer comment of GCS related terraform
 state configuration

---
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 291ff0c71..cdcb966d2 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -392,7 +392,7 @@ production: &base
         google_project: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}}
         google_client_email: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}}
         google_json_key_location: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}}
-        #end-terraform_state-aws
+        #end-terraform_state-gcs
 
   ## GitLab Pages
   pages:

From 82e88ff0ad12186f594791db58d23eb68211567f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= <peter.jozsa@icloud.com>
Date: Mon, 11 Apr 2022 11:50:32 +0200
Subject: [PATCH 0740/1124] create terraform state directory based on new
 configuration variables during datadir initialization

#2501
---
 assets/runtime/functions | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index b67fd248c..e57c03b82 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1544,11 +1544,11 @@ initialize_datadir() {
   chown ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR}
 
   # create terraform_state directory
-  # TODO : parametarize path and replace with it (e.g. GITLAB_TERRAFORM_STATE_STORAGE_PATH) - see sameersbn/gitlab#2438
-  # TODO : wrap with "if [[ _ENABLED == true ]]" condition
-  mkdir -p ${GITLAB_SHARED_DIR}/terraform_state
-  chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state
-  chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state
+  if [[ ${GITLAB_TERRAFORM_STATE_ENABLED} == true ]]; then
+    mkdir -p ${GITLAB_TERRAFORM_STATE_STORAGE_PATH}
+    chmod u+rwX ${GITLAB_TERRAFORM_STATE_STORAGE_PATH}
+    chown ${GITLAB_USER}: ${GITLAB_TERRAFORM_STATE_STORAGE_PATH}
+  fi
 
   # create registry dir
   if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then

From 9826fdb9cacd909150d0e98d64042965e8cd47a8 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 13 Apr 2022 17:45:13 +0900
Subject: [PATCH 0741/1124] Upgrade Gitlab CE to 14.9.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 39b452ae7..602d6c536 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**14.9.3**
+- gitlab: upgrade CE to v14.9.3
+- gitaly: upgrade to v14.9.3
+- ubuntu: upgrade to focal-20220404
+
 **14.9.2**
 - gitlab: upgrade CE to v14.9.2
 - gitaly: upgrade to v14.9.2
diff --git a/Dockerfile b/Dockerfile
index b5ef2b31e..5c7cb5d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20220316
+FROM ubuntu:focal-20220404
 
-ARG VERSION=14.9.2
+ARG VERSION=14.9.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.8 \
     GITLAB_SHELL_VERSION=13.24.0 \
     GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.9.2 \
+    GITALY_SERVER_VERSION=14.9.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b73943378..1242e0f2c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.9.2
+# sameersbn/gitlab:14.9.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.2
+docker pull sameersbn/gitlab:14.9.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.9.2
+ sameersbn/gitlab:14.9.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.9.2
+    sameersbn/gitlab:14.9.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:sanitize
+    sameersbn/gitlab:14.9.3 app:sanitize
 ```
 
 #### Piwik
@@ -2351,7 +2351,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2386,14 +2386,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake db:setup
+    sameersbn/gitlab:14.9.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2402,7 +2402,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2451,7 +2451,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.9.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2464,7 +2464,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2495,7 +2495,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2519,12 +2519,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.2
+docker pull sameersbn/gitlab:14.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2549,7 +2549,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.3
 ```
 
 ### Shell Access
@@ -2587,7 +2587,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0a73f9bb0..a27b97d18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.2
+14.9.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c5f377260..9bd6d332d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ebc00a6dd..421d9bf30 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f7e061b43..c0b9fb5af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 36fd9d5c7..ba6571f65 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.2
+docker pull sameersbn/gitlab:14.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.9.2
+sameersbn/gitlab:14.9.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fff7a7431..a7bd29ea3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 57ab80f72..1cf5482ba 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.2
+    image: sameersbn/gitlab:14.9.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dad8f4a4a..f64f63f78 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.9.2
+        image: sameersbn/gitlab:14.9.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 464cd644d6cbfd47a6a6252efd3845049f8f0426 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 22 Mar 2022 15:56:27 +0900
Subject: [PATCH 0742/1124] set bundler version based on gitlab's Gemfile.lock

bundler used in gitlab is upgraded from 2.1.4 to 2.3.6
See more detail on : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79251
first contained tag : v14.8.0
---
 assets/build/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index a41ead05e..f09b207db 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -90,6 +90,10 @@ fi
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
 GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}
 
+# install bundler: use version specified in Gemfile.lock
+BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")"
+gem install bundler:"${BUNDLER_VERSION}" 
+
 # download golang
 echo "Downloading Go ${GOLANG_VERSION}..."
 wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/

From 5caa10b5637152ad9489b483d6bd54e0fdf6a969 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 13 Apr 2022 19:18:49 +0200
Subject: [PATCH 0743/1124] Upgrade go to v1.17.9

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 602d6c536..c046dde84 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **14.9.3**
 - gitlab: upgrade CE to v14.9.3
 - gitaly: upgrade to v14.9.3
+- golang: upgrade to v1.17.9
 - ubuntu: upgrade to focal-20220404
 
 **14.9.2**
diff --git a/Dockerfile b/Dockerfile
index 5c7cb5d30..6fc8b4f10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=14.9.3
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.5 \
     RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
-    GOLANG_VERSION=1.17.8 \
+    GOLANG_VERSION=1.17.9 \
     GITLAB_SHELL_VERSION=13.24.0 \
     GITLAB_PAGES_VERSION=1.56.1 \
     GITALY_SERVER_VERSION=14.9.3 \

From db40f05dd30ae2602be612fff15b616fe6b2fc07 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 13 Apr 2022 19:20:02 +0200
Subject: [PATCH 0744/1124] Upgrade ruby to v.2.7.6

---
 Changelog.md | 1 +
 Dockerfile   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c046dde84..c5d795768 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v14.9.3
 - gitaly: upgrade to v14.9.3
 - golang: upgrade to v1.17.9
+- ruby: upgrade to v2.7.6
 - ubuntu: upgrade to focal-20220404
 
 **14.9.2**
diff --git a/Dockerfile b/Dockerfile
index 6fc8b4f10..098e513cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20220404
 ARG VERSION=14.9.3
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.5 \
-    RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
+    RUBY_VERSION=2.7.6 \
+    RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.9 \
     GITLAB_SHELL_VERSION=13.24.0 \
     GITLAB_PAGES_VERSION=1.56.1 \

From 950bb3d657b79c2196f27215854b31e399442a95 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 22 Apr 2022 15:09:58 +0200
Subject: [PATCH 0745/1124] Update README.md

Add proposed changes (see #2438).
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9d4305cbe..0dcc57a85 100644
--- a/README.md
+++ b/README.md
@@ -1132,7 +1132,7 @@ AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT`
 
 ##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
-Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE`
+Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE`
 
 ##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION`
 
@@ -1236,7 +1236,7 @@ Bucket name to store the Terraform state. Defaults to `terraform_state`
 
 ##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER`
 
-Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`)
+Connection Provider for the Object Store (AWS or Google). Defaults to $GITLAB_OBJECT_STORE_CONNECTION_PROVIDER (i.e. AWS).
 
 ##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID`
 

From ac1c5a032da639b0211c7399dab9b17396c489f3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 23 Apr 2022 15:55:26 +0200
Subject: [PATCH 0746/1124] Upgrade GitLab CE to 14.10.0

---
 Changelog.md                            |  9 ++++-
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5d795768..18b7358d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,13 @@
 # Changelog
 
-This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in 
+GitLab.
+
+**14.10.0**
+- gitlab: upgrade CE to v14.10.0
+- gitaly: upgrade to v14.10.0
+- gitlab-shell: upgrade to v13.25.1
+- ubuntu: upgrade to focal-20220415
 
 **14.9.3**
 - gitlab: upgrade CE to v14.9.3
diff --git a/Dockerfile b/Dockerfile
index 098e513cd..ffb6b4e07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220415
 
-ARG VERSION=14.9.3
+ARG VERSION=14.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.9 \
-    GITLAB_SHELL_VERSION=13.24.0 \
+    GITLAB_SHELL_VERSION=13.25.1 \
     GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.9.3 \
+    GITALY_SERVER_VERSION=14.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 70809050a..a79588bed 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.9.3
+# sameersbn/gitlab:14.10.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.3
+docker pull sameersbn/gitlab:14.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.9.3
+ sameersbn/gitlab:14.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.9.3
+    sameersbn/gitlab:14.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:sanitize
+    sameersbn/gitlab:14.10.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake db:setup
+    sameersbn/gitlab:14.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.3
+docker pull sameersbn/gitlab:14.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a27b97d18..6242bb49d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.9.3
+14.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9bd6d332d..53d899180 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 421d9bf30..ef922c8ab 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c0b9fb5af..632587f0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ba6571f65..d25479f5d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.9.3
+docker pull sameersbn/gitlab:14.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.9.3
+sameersbn/gitlab:14.10.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a7bd29ea3..62cd6a59d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1cf5482ba..8780d5e00 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.9.3
+    image: sameersbn/gitlab:14.10.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f64f63f78..590a74519 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.9.3
+        image: sameersbn/gitlab:14.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c8d32e09b035b69604e4f50d6913d6b921a9b01a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 23 Apr 2022 16:45:19 +0200
Subject: [PATCH 0747/1124] Upgrade nodejs to 16.x

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

diff --git a/Dockerfile b/Dockerfile
index ffb6b4e07..d9c535e8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex && \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_12.x focal main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb https://deb.nodesource.com/node_16.x focal main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && set -ex \

From 21b459216bd06f8c8eaa6d3c8a64ef46e76322b4 Mon Sep 17 00:00:00 2001
From: Paolo Mainardi <paolo.mainardi@sparkfabrik.com>
Date: Fri, 29 Apr 2022 17:19:36 +0200
Subject: [PATCH 0748/1124] refs #2549: Install git from gitaly

---
 Dockerfile              | 3 ++-
 assets/build/install.sh | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9c535e8d..b3b9c4db8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,10 +45,11 @@ RUN set -ex && \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \
-      git-core python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
+      python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
       libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
+      libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \
       libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index f09b207db..e2ab048e4 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -92,7 +92,7 @@ GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_
 
 # install bundler: use version specified in Gemfile.lock
 BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")"
-gem install bundler:"${BUNDLER_VERSION}" 
+gem install bundler:"${BUNDLER_VERSION}"
 
 # download golang
 echo "Downloading Go ${GOLANG_VERSION}..."
@@ -148,6 +148,10 @@ cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR
 rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache
 chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
 
+# install git bundled with gitaly.
+make -C ${GITLAB_GITALY_BUILD_DIR} git GIT_PREFIX=/usr/local
+apt remove -y git-core
+
 # clean up
 rm -rf ${GITLAB_GITALY_BUILD_DIR}
 
@@ -456,4 +460,4 @@ rm -rf /var/lib/apt/lists/*
 # clean up caches
 rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go
 rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules
-rm -r /tmp/* 
+rm -r /tmp/*

From a02abdce2d3ff11ca62d0733dd4c346a3e0a4d72 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 3 May 2022 17:58:58 +0200
Subject: [PATCH 0749/1124] Address inconsistencies when using git (packaged
 with gitaly).

---
 Dockerfile                                | 2 +-
 assets/build/install.sh                   | 2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3b9c4db8..49cb5929d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
       libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
-      libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \
+      libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \
       libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index e2ab048e4..c414596b4 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -24,7 +24,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libpq-dev zlib1g-dev libyaml-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
-  gettext libkrb5-dev"
+  gettext libkrb5-dev git-core"
 
 ## Execute a command as GITLAB_USER
 exec_as_git() {
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index fb6b791c4..a0c478918 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1147,7 +1147,7 @@ production: &base
   # CAUTION!
   # Use the default values unless you really know what you are doing
   git:
-    bin_path: /usr/bin/git
+    bin_path: /usr/local/bin/git
 
   ## ActionCable settings
   action_cable:

From 889d9c36bf257f7953e6cbffc53ba54ef715df94 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 3 May 2022 19:14:18 +0200
Subject: [PATCH 0750/1124] collective deletion of packages

---
 assets/build/install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index c414596b4..08f71dc8a 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -150,7 +150,6 @@ chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}
 
 # install git bundled with gitaly.
 make -C ${GITLAB_GITALY_BUILD_DIR} git GIT_PREFIX=/usr/local
-apt remove -y git-core
 
 # clean up
 rm -rf ${GITLAB_GITALY_BUILD_DIR}

From 64e6256012e5c9b5742db626b4c0256b22132ba4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 3 May 2022 19:36:22 +0200
Subject: [PATCH 0751/1124] transfer build packages from Dockerfile to
 install.sh

---
 Dockerfile              | 1 -
 assets/build/install.sh | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49cb5929d..e000739cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,6 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
       libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
-      libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \
       libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 08f71dc8a..8faacef55 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -24,7 +24,8 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libpq-dev zlib1g-dev libyaml-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
-  gettext libkrb5-dev git-core"
+  gettext libkrb5-dev \
+  libexpat1-dev libz-dev libpcre2-dev build-essential git-core"
 
 ## Execute a command as GITLAB_USER
 exec_as_git() {

From 3b65ac4eed4ef205a3a105c62365f404a8a1e3f2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 3 May 2022 21:31:03 +0200
Subject: [PATCH 0752/1124] Upgrade GitLab CE to 14.10.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 18b7358d8..5ea54441f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in 
 GitLab.
 
+**14.10.1**
+- gitlab: upgrade CE to v14.10.1
+- gitaly: upgrade to v14.10.1
+- ubuntu: upgrade to focal-20220426
+
 **14.10.0**
 - gitlab: upgrade CE to v14.10.0
 - gitaly: upgrade to v14.10.0
diff --git a/Dockerfile b/Dockerfile
index e000739cd..0dc7c5b0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20220415
+FROM ubuntu:focal-20220426
 
-ARG VERSION=14.10.0
+ARG VERSION=14.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.9 \
     GITLAB_SHELL_VERSION=13.25.1 \
     GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.10.0 \
+    GITALY_SERVER_VERSION=14.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a79588bed..8222c0286 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.10.0
+# sameersbn/gitlab:14.10.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.0
+docker pull sameersbn/gitlab:14.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.10.0
+ sameersbn/gitlab:14.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.10.0
+    sameersbn/gitlab:14.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:sanitize
+    sameersbn/gitlab:14.10.1 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake db:setup
+    sameersbn/gitlab:14.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.0
+docker pull sameersbn/gitlab:14.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.1
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6242bb49d..05bf2c699 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.10.0
+14.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 53d899180..b41d8adfb 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ef922c8ab..1ae13575d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 632587f0e..c0e61d1c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d25479f5d..7c24d7bba 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.0
+docker pull sameersbn/gitlab:14.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.10.0
+sameersbn/gitlab:14.10.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 62cd6a59d..272b1fc91 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8780d5e00..fe35a31fa 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.0
+    image: sameersbn/gitlab:14.10.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 590a74519..266df69bf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.10.0
+        image: sameersbn/gitlab:14.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From a6ce664f2196e655b0d86e2d9f9567d5acd13169 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 5 May 2022 19:35:21 +0200
Subject: [PATCH 0753/1124] Upgrade GitLab CE to 14.10.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5ea54441f..d8a13d794 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,11 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in 
 GitLab.
 
+**14.10.2**
+- gitlab: upgrade CE to v14.10.2
+- gitaly: upgrade to v14.10.2
+- ubuntu: upgrade to focal-20220426
+
 **14.10.1**
 - gitlab: upgrade CE to v14.10.1
 - gitaly: upgrade to v14.10.1
diff --git a/Dockerfile b/Dockerfile
index 0dc7c5b0b..e223e7e81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220426
 
-ARG VERSION=14.10.1
+ARG VERSION=14.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.9 \
     GITLAB_SHELL_VERSION=13.25.1 \
     GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.10.1 \
+    GITALY_SERVER_VERSION=14.10.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8222c0286..d2f059a4a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.10.1
+# sameersbn/gitlab:14.10.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.1
+docker pull sameersbn/gitlab:14.10.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.10.1
+ sameersbn/gitlab:14.10.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.10.1
+    sameersbn/gitlab:14.10.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:sanitize
+    sameersbn/gitlab:14.10.2 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake db:setup
+    sameersbn/gitlab:14.10.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:14.10.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.1
+docker pull sameersbn/gitlab:14.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.2
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 05bf2c699..d971a451e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.10.1
+14.10.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b41d8adfb..f9a5ccfb8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1ae13575d..226480924 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c0e61d1c4..d7500f6e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7c24d7bba..86e70cf91 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.1
+docker pull sameersbn/gitlab:14.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.10.1
+sameersbn/gitlab:14.10.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 272b1fc91..5cb48921b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fe35a31fa..7c47e73fa 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.1
+    image: sameersbn/gitlab:14.10.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 266df69bf..5394617e3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.10.1
+        image: sameersbn/gitlab:14.10.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 0badf7cdd7bc95e79b3b5548c0eb445662c03031 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 5 May 2022 19:53:52 +0200
Subject: [PATCH 0754/1124] Use git instead of git-core

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 8faacef55..f34537d83 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -25,7 +25,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
   gettext libkrb5-dev \
-  libexpat1-dev libz-dev libpcre2-dev build-essential git-core"
+  libexpat1-dev libz-dev libpcre2-dev build-essential git"
 
 ## Execute a command as GITLAB_USER
 exec_as_git() {

From 944a638a2825392b240f7e2008aece74e56ab203 Mon Sep 17 00:00:00 2001
From: haroldsamuels87 <103807989+haroldsamuels87@users.noreply.github.com>
Date: Thu, 12 May 2022 18:13:55 +0430
Subject: [PATCH 0755/1124] fixed a typo

took me 5 HOURS to find this tiny little typo.
---
 assets/runtime/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index e57c03b82..b9cbfdc0a 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1561,7 +1561,7 @@ initialize_datadir() {
   if [[ ${GITLAB_PACKAGES_ENABLED} == true ]]; then
     mkdir -p ${GITLAB_PACKAGES_DIR}
     chmod u+rwX ${GITLAB_PACKAGES_DIR}
-    chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR}
+    chown ${GITLAB_USER}: ${GITLAB_PACKAGES_DIR}
   fi
 
   # create the backups directory
@@ -1642,7 +1642,7 @@ sanitize_datadir() {
 
   if [[ ${GITLAB_PACKAGES_ENABLED} ]]; then
     chmod u+rwX ${GITLAB_PACKAGES_DIR}
-    chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR}
+    chown ${GITLAB_USER}: ${GITLAB_PACKAGES_DIR}
   fi
 
   find ${GITLAB_DATA_DIR}/uploads -type f -exec chmod 0644 {} \;

From e119dad3620090ae8fbb958165c02d5cdee8d389 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 May 2022 19:25:39 +0200
Subject: [PATCH 0756/1124] Update docker orb

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f3cead2d0..d6ddc8f14 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   shellcheck: circleci/shellcheck@1.3.16
-  docker: circleci/docker@1.0.1
+  docker: circleci/docker@2.1.1
   go: circleci/go@1.1.1
 
 commands:

From e95cf008e361b6a79dceb8434491869fcbe5dee2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 May 2022 19:27:03 +0200
Subject: [PATCH 0757/1124] Update shellcheck orb

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6ddc8f14..21b07b58a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  shellcheck: circleci/shellcheck@1.3.16
+  shellcheck: circleci/shellcheck@3.1.1
   docker: circleci/docker@2.1.1
   go: circleci/go@1.1.1
 

From 8294651b1f62b9a964ad19100e5f5cee2ba0914b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 May 2022 19:27:21 +0200
Subject: [PATCH 0758/1124] Update go orb

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21b07b58a..fb58d089c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 orbs:
   shellcheck: circleci/shellcheck@3.1.1
   docker: circleci/docker@2.1.1
-  go: circleci/go@1.1.1
+  go: circleci/go@1.7.1
 
 commands:
   docker-build:

From 602c36907cd1ffadf0115e0e4cbd5e18338a8b3d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 May 2022 19:37:07 +0200
Subject: [PATCH 0759/1124] Fix unexpected argument(s): ignore

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb58d089c..6018c6c05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -285,7 +285,7 @@ workflows:
     jobs:
       - shellcheck/check:
           name: shellcheck
-          ignore: SC2086,SC2181
+          exclude: SC2086,SC2181
           filters:
             tags:
               only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/

From b17ef31fb238e1b1f515247078e9a07cf1b1d48d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 May 2022 19:51:20 +0200
Subject: [PATCH 0760/1124] Activate external_sources for shellcheck in CI

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6018c6c05..d2e2676f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -286,6 +286,7 @@ workflows:
       - shellcheck/check:
           name: shellcheck
           exclude: SC2086,SC2181
+          external_sources: true
           filters:
             tags:
               only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/

From 817f40ac2d0d5adee7aa7cab67b5d37a1ca64ab1 Mon Sep 17 00:00:00 2001
From: Paolo Mainardi <paolo.mainardi@sparkfabrik.com>
Date: Mon, 23 May 2022 11:12:44 +0200
Subject: [PATCH 0761/1124] Upgrade to 14.10.3

---
 Changelog.md                            |  6 ++-
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d8a13d794..a2163194c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,12 @@
 # Changelog
 
-This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in 
+This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in
 GitLab.
 
+**14.10.3**
+- gitlab: upgrade CE to v14.10.3
+- gitaly: upgrade to v14.10.3
+
 **14.10.2**
 - gitlab: upgrade CE to v14.10.2
 - gitaly: upgrade to v14.10.2
diff --git a/Dockerfile b/Dockerfile
index e223e7e81..0e34972cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220426
 
-ARG VERSION=14.10.2
+ARG VERSION=14.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.9 \
     GITLAB_SHELL_VERSION=13.25.1 \
     GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.10.2 \
+    GITALY_SERVER_VERSION=14.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d2f059a4a..2e4b95c79 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.10.2
+# sameersbn/gitlab:14.10.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.2
+docker pull sameersbn/gitlab:14.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.10.2
+ sameersbn/gitlab:14.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.10.2
+    sameersbn/gitlab:14.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:sanitize
+    sameersbn/gitlab:14.10.3 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake db:setup
+    sameersbn/gitlab:14.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:env:info
+    sameersbn/gitlab:14.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:14.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.2
+docker pull sameersbn/gitlab:14.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.3
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d971a451e..77d734108 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.10.2
+14.10.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f9a5ccfb8..c8d7bcbc5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 226480924..d01717cdc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d7500f6e2..c145f0be4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 86e70cf91..202fb3e2b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.2
+docker pull sameersbn/gitlab:14.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.10.2
+sameersbn/gitlab:14.10.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5cb48921b..b927493a7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7c47e73fa..f42ea2674 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.2
+    image: sameersbn/gitlab:14.10.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5394617e3..0a96206b6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.10.2
+        image: sameersbn/gitlab:14.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 1212255dc422ab0ebd6d6c448c5e90b73356b091 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 24 May 2022 16:01:33 +0200
Subject: [PATCH 0762/1124] Upgrade GitLab CE to 15.0.0

---
 Changelog.md                            | 10 ++++-
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a2163194c..8784e4cd5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,13 @@
 # Changelog
 
-This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in
-GitLab.
+This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+
+**15.0.0**
+- gitlab: upgrade CE to v15.0.0
+- gitaly: upgrade to v15.0.0
+- golang: upgrade to v1.17.10
+- gitlab-shell: upgrade to v14.3.0
+- gitlab-pages: upgrade to v1.58.0
 
 **14.10.3**
 - gitlab: upgrade CE to v14.10.3
diff --git a/Dockerfile b/Dockerfile
index 0e34972cc..82d1a7e9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220426
 
-ARG VERSION=14.10.3
+ARG VERSION=15.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
-    GOLANG_VERSION=1.17.9 \
-    GITLAB_SHELL_VERSION=13.25.1 \
-    GITLAB_PAGES_VERSION=1.56.1 \
-    GITALY_SERVER_VERSION=14.10.3 \
+    GOLANG_VERSION=1.17.10 \
+    GITLAB_SHELL_VERSION=14.3.0 \
+    GITLAB_PAGES_VERSION=1.58.0 \
+    GITALY_SERVER_VERSION=15.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2e4b95c79..a769e53a6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:14.10.3
+# sameersbn/gitlab:15.0.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.3
+docker pull sameersbn/gitlab:15.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:14.10.3
+ sameersbn/gitlab:15.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:14.10.3
+    sameersbn/gitlab:15.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:sanitize
+    sameersbn/gitlab:15.0.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake db:setup
+    sameersbn/gitlab:15.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.3
+docker pull sameersbn/gitlab:15.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 77d734108..94188a748 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.10.3
+15.0.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c8d7bcbc5..22780eb5b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d01717cdc..06b75b66f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c145f0be4..4e95bf0e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 202fb3e2b..3758da92a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.10.3
+docker pull sameersbn/gitlab:15.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:14.10.3
+sameersbn/gitlab:15.0.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b927493a7..55ecccb07 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f42ea2674..913d3af9c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.10.3
+    image: sameersbn/gitlab:15.0.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0a96206b6..739a86a02 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.10.3
+        image: sameersbn/gitlab:15.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 0f6c07c99cc8620845a7e56db757ebba9c97a705 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 2 Jun 2022 20:22:57 +0200
Subject: [PATCH 0763/1124] Upgrade GitLab CE to 15.0.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8784e4cd5..1422bef43 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.0.1**
+- gitlab: upgrade CE to v15.0.1
+- gitaly: upgrade to v15.0.1
+- golang: upgrade to v1.17.11
+
 **15.0.0**
 - gitlab: upgrade CE to v15.0.0
 - gitaly: upgrade to v15.0.0
diff --git a/Dockerfile b/Dockerfile
index 82d1a7e9b..00038ebd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220426
 
-ARG VERSION=15.0.0
+ARG VERSION=15.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
-    GOLANG_VERSION=1.17.10 \
+    GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.3.0 \
     GITLAB_PAGES_VERSION=1.58.0 \
-    GITALY_SERVER_VERSION=15.0.0 \
+    GITALY_SERVER_VERSION=15.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a769e53a6..dd169f2ca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.0.0
+# sameersbn/gitlab:15.0.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.0
+docker pull sameersbn/gitlab:15.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.0.0
+ sameersbn/gitlab:15.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.0.0
+    sameersbn/gitlab:15.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:sanitize
+    sameersbn/gitlab:15.0.1 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake db:setup
+    sameersbn/gitlab:15.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.0
+docker pull sameersbn/gitlab:15.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.1
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 94188a748..2bbd2b4b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.0
+15.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 22780eb5b..d0de26971 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 06b75b66f..ee996ca29 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e95bf0e9..a8dc986d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3758da92a..3076cf40d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.0
+docker pull sameersbn/gitlab:15.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.0.0
+sameersbn/gitlab:15.0.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 55ecccb07..296e9ac1e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 913d3af9c..b57ea8f56 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.0
+    image: sameersbn/gitlab:15.0.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 739a86a02..2872037f9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.0.0
+        image: sameersbn/gitlab:15.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 2e8ba4f3d3860d04fa3a1d613cda1470889f8c29 Mon Sep 17 00:00:00 2001
From: ian zhang <ian.zhangzhe@gmail.com>
Date: Sun, 5 Jun 2022 16:56:59 +0800
Subject: [PATCH 0764/1124] Update docker command for sample poostgresql

As the default postgresql version had been upgraded as version 12,  the sample command should be updating too, otherwise, we will meet permission issue during first execution.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a769e53a6..373d66e2a 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ Step 1. Launch a postgresql container
 docker run --name gitlab-postgresql -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
-    --env 'DB_EXTENSION=pg_trgm' \
+    --env 'DB_EXTENSION=pg_trgm,btree_gist' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
     sameersbn/postgresql:12-20200524
 ```

From 96d7a25acf3dbd63a32533128511b0faccd0c259 Mon Sep 17 00:00:00 2001
From: Antt1995 <antt1995@users.noreply.github.com>
Date: Wed, 8 Jun 2022 16:57:44 +0100
Subject: [PATCH 0765/1124] Update Dockerfile

Update to V15.0.2
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 00038ebd6..b73a47ca2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220426
 
-ARG VERSION=15.0.1
+ARG VERSION=15.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \

From 22fb05567a7f3bd0f9cdad26212ecb51e68233bc Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 11 Jun 2022 13:32:21 +0200
Subject: [PATCH 0766/1124] Completing PR for GitLab CE Upgrade

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1422bef43..a7b87d0c5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.0.2**
+- gitlab: upgrade CE to v15.0.2
+- gitaly: upgrade to v15.0.2
+- ubuntu: upgrade to focal-20220531
+
 **15.0.1**
 - gitlab: upgrade CE to v15.0.1
 - gitaly: upgrade to v15.0.1
diff --git a/Dockerfile b/Dockerfile
index b73a47ca2..60d14d183 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220426
+FROM ubuntu:focal-20220531
 
 ARG VERSION=15.0.2
 
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.3.0 \
     GITLAB_PAGES_VERSION=1.58.0 \
-    GITALY_SERVER_VERSION=15.0.1 \
+    GITALY_SERVER_VERSION=15.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 07b486e5b..c54292aef 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.0.1
+# sameersbn/gitlab:15.0.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.1
+docker pull sameersbn/gitlab:15.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.0.1
+ sameersbn/gitlab:15.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.0.1
+    sameersbn/gitlab:15.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:sanitize
+    sameersbn/gitlab:15.0.2 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake db:setup
+    sameersbn/gitlab:15.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.1
+docker pull sameersbn/gitlab:15.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.2
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2bbd2b4b4..7c626aa69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.1
+15.0.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index d0de26971..7c1a23c5f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ee996ca29..4ab4b32d9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a8dc986d5..f36b01845 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3076cf40d..551fe5b87 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.1
+docker pull sameersbn/gitlab:15.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.0.1
+sameersbn/gitlab:15.0.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 296e9ac1e..fcad91dc0 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b57ea8f56..2822bfac9 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.1
+    image: sameersbn/gitlab:15.0.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2872037f9..3168beaad 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.0.1
+        image: sameersbn/gitlab:15.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 17a26ab1ea827fa689363b1b33196a86414edb7e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 12 Jun 2022 09:34:05 +0200
Subject: [PATCH 0767/1124] Temporary modification of the release notes

---
 scripts/release-notes.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index bd49f28e1..f84c2ba23 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -34,6 +34,12 @@ ${NOTABLE_CHANGES}
 
 For installation and usage instructions please refer to the [README](https://github.com/sameersbn/docker-gitlab/blob/${RELEASE}/README.md)
 
+## Important notes
+
+Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent.
+
+You are kindly invited to provide contributions.
+
 ## Contributing
 
 If you find this image useful here's how you can help:

From 646bf6e836876b6b3eb190c808ed54ae7f1123d5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 17 Jun 2022 20:33:49 +0200
Subject: [PATCH 0768/1124] Upgrade GitLab CE to 15.0.3

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a7b87d0c5..1ebc8bbd9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.0.3**
+- gitlab: upgrade CE to v15.0.3
+- gitaly: upgrade to v15.0.3
+
 **15.0.2**
 - gitlab: upgrade CE to v15.0.2
 - gitaly: upgrade to v15.0.2
diff --git a/Dockerfile b/Dockerfile
index 60d14d183..48064b423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.0.2
+ARG VERSION=15.0.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.3.0 \
     GITLAB_PAGES_VERSION=1.58.0 \
-    GITALY_SERVER_VERSION=15.0.2 \
+    GITALY_SERVER_VERSION=15.0.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c54292aef..019a220fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.0.2
+# sameersbn/gitlab:15.0.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.2
+docker pull sameersbn/gitlab:15.0.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.0.2
+ sameersbn/gitlab:15.0.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.0.2
+    sameersbn/gitlab:15.0.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:sanitize
+    sameersbn/gitlab:15.0.3 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake db:setup
+    sameersbn/gitlab:15.0.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.0.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.2
+docker pull sameersbn/gitlab:15.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.3
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7c626aa69..13577ced6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.2
+15.0.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7c1a23c5f..7a4ef6903 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4ab4b32d9..e73d29d2d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f36b01845..f8b1ba667 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 551fe5b87..fb9e873ac 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.2
+docker pull sameersbn/gitlab:15.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.0.2
+sameersbn/gitlab:15.0.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fcad91dc0..f0ac45286 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2822bfac9..a4f258f47 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.2
+    image: sameersbn/gitlab:15.0.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3168beaad..ea5e8eda8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.0.2
+        image: sameersbn/gitlab:15.0.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 844d57dad2a066a92b021587f6e637b0b522fc98 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 4 Jun 2022 22:55:03 +0900
Subject: [PATCH 0769/1124] update `*:object_store:enabled` regardless of the
 value

apply for artifact,packages,terraform_state,lfs,uploads
---
 assets/runtime/functions | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index b9cbfdc0a..07477a6ae 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -980,6 +980,9 @@ gitlab_configure_ci() {
 }
 
 gitlab_configure_artifacts() {
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED
+
   if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::artifacts:object_store"
 
@@ -997,7 +1000,6 @@ gitlab_configure_artifacts() {
     fi
 
     update_template ${GITLAB_CONFIG} \
-      GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \
       GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \
       GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD \
       GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \
@@ -1025,6 +1027,9 @@ gitlab_configure_artifacts() {
 
 
 gitlab_configure_packages() {
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_PACKAGES_OBJECT_STORE_ENABLED
+
   if [[ ${GITLAB_PACKAGES_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::packages:object_store"
 
@@ -1042,7 +1047,6 @@ gitlab_configure_packages() {
     fi
 
     update_template ${GITLAB_CONFIG} \
-      GITLAB_PACKAGES_OBJECT_STORE_ENABLED \
       GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY \
       GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD \
       GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD \
@@ -1069,6 +1073,9 @@ gitlab_configure_packages() {
 }
 
 gitlab_configure_terraform_state() {
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED
+  
   if [[ ${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::terraform_state:object_store"
 
@@ -1086,7 +1093,6 @@ gitlab_configure_terraform_state() {
     fi
 
     update_template ${GITLAB_CONFIG} \
-      GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED \
       GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY \
       GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER \
       GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \
@@ -1110,6 +1116,9 @@ gitlab_configure_terraform_state() {
 }
 
 gitlab_configure_lfs() {
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_LFS_OBJECT_STORE_ENABLED \
+  
   if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::lfs:object_store"
 
@@ -1127,7 +1136,6 @@ gitlab_configure_lfs() {
     fi
 
     update_template ${GITLAB_CONFIG} \
-      GITLAB_LFS_OBJECT_STORE_ENABLED \
       GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \
       GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \
       GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \
@@ -1154,6 +1162,9 @@ gitlab_configure_lfs() {
 }
 
 gitlab_configure_uploads() {
+  update_template ${GITLAB_CONFIG} \
+    GITLAB_UPLOADS_OBJECT_STORE_ENABLED
+
   if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then
     echo "Configuring gitlab::uploads:object_store"
 
@@ -1171,7 +1182,6 @@ gitlab_configure_uploads() {
     fi
 
     update_template ${GITLAB_CONFIG} \
-      GITLAB_UPLOADS_OBJECT_STORE_ENABLED \
       GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \
       GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \
       GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \

From fbcdd290becbbca4b7d3bb23e1de8769e886bf4e Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 5 Jun 2022 16:01:21 +0900
Subject: [PATCH 0770/1124] fix condition to apply patch during build gitlab

rewrite patch applying with find | while read chain
`if [[ -f ]]` with globbing may not works
---
 assets/build/install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index f34537d83..3d488e156 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -83,10 +83,10 @@ exec_as_git git config --global advice.detachedHead false
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
 
-if [[ -d "${GITLAB_BUILD_DIR}/patches" && -f "${GITLAB_BUILD_DIR}/patches/*.patch" ]]; then
-  echo "Applying patches for gitlab-foss..."
-  exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch
-fi
+find "${GITLAB_BUILD_DIR}/patches/" -name "*.patch" | while read -r patch_file; do
+  printf "Applying patch %s for gitlab-foss...\n" "${patch_file}"
+  exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < "${patch_file}"
+done
 
 GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)}
 GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}

From 7d0739218f52744881e381f0c7d59d7ea15d18aa Mon Sep 17 00:00:00 2001
From: Poppo <giuseppe.arancio@sparkfabrik.com>
Date: Fri, 24 Jun 2022 20:12:32 +0200
Subject: [PATCH 0771/1124] fix env default variable

---
 assets/runtime/env-defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index f2d25e6ac..908d368fc 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -176,7 +176,7 @@ GITLAB_TERRAFORM_STATE_ENABLED=${GITLAB_TERRAFORM_STATE_ENABLED:-true}
 GITLAB_TERRAFORM_STATE_STORAGE_PATH="${GITLAB_TERRAFORM_STATE_STORAGE_PATH:-$GITLAB_SHARED_DIR/terraform_state}"
 
 GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED:-false}
-GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state}
+GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state}
 GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER}
 
 # TERRAFORM STATE:AWS

From 6da7a2a07fb9d2858691cc5d4ae38f632292f023 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Jun 2022 11:42:26 +0200
Subject: [PATCH 0772/1124] Upgrade GitLab CE to 15.1.0

---
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 scripts/release-notes.sh                | 10 +++++
 11 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 48064b423..6a9713416 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.0.3
+ARG VERSION=15.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.11 \
-    GITLAB_SHELL_VERSION=14.3.0 \
-    GITLAB_PAGES_VERSION=1.58.0 \
-    GITALY_SERVER_VERSION=15.0.3 \
+    GITLAB_SHELL_VERSION=14.7.4 \
+    GITLAB_PAGES_VERSION=1.59.0 \
+    GITALY_SERVER_VERSION=15.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 019a220fe..f6d4e59c1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.0.3
+# sameersbn/gitlab:15.1.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.3
+docker pull sameersbn/gitlab:15.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.0.3
+ sameersbn/gitlab:15.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.0.3
+    sameersbn/gitlab:15.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:sanitize
+    sameersbn/gitlab:15.1.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake db:setup
+    sameersbn/gitlab:15.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.3
+docker pull sameersbn/gitlab:15.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 13577ced6..d14dfbac3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.3
+15.1.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7a4ef6903..d4ffcce7b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e73d29d2d..edcd69cb5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f8b1ba667..61b59a0c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fb9e873ac..00aaa6f51 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.0.3
+docker pull sameersbn/gitlab:15.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.0.3
+sameersbn/gitlab:15.1.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f0ac45286..9a5a027a7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a4f258f47..7447fe332 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.0.3
+    image: sameersbn/gitlab:15.1.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ea5e8eda8..192bb1d25 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.0.3
+        image: sameersbn/gitlab:15.1.0
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index f84c2ba23..bc5140e16 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -40,6 +40,16 @@ Please note that this version does not yet include any rework as a consequence o
 
 You are kindly invited to provide contributions.
 
+### Version-specific instructions for upgrades
+
+Please consider the version specific upgrading instructions for [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500) and [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510)
+
+* Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version.
+* If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing.
+* The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload.
+* The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0.
+* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later.
+
 ## Contributing
 
 If you find this image useful here's how you can help:

From 4c576911b68be7abe67f7de760d7dddf0a32f19e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Jun 2022 11:46:28 +0200
Subject: [PATCH 0773/1124] Udate Changelog

---
 Changelog.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 1ebc8bbd9..c35ba8135 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.1.0**
+
+- gitlab: upgrade CE to v15.1.0
+- gitaly: upgrade to v15.1.0
+- gitlab-shell: upgrade to v14.7.4
+- gitlab-pages: upgrade to v1.59.0
+
 **15.0.3**
 - gitlab: upgrade CE to v15.0.3
 - gitaly: upgrade to v15.0.3

From 5c9c5cad1b027a00c4dd3abe9ce53efa39b4b7c3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Jun 2022 13:39:08 +0200
Subject: [PATCH 0774/1124] Temporary remove `geo` from `config/database.yml`

---
 assets/build/config/database.yml.postgresql | 100 ++++++++++++++++++++
 assets/build/install.sh                     |   6 +-
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 assets/build/config/database.yml.postgresql

diff --git a/assets/build/config/database.yml.postgresql b/assets/build/config/database.yml.postgresql
new file mode 100644
index 000000000..180f8b018
--- /dev/null
+++ b/assets/build/config/database.yml.postgresql
@@ -0,0 +1,100 @@
+# HINT: This file is identical to the corresponding configuration file from the
+# upstream repository, where the additional defined entries for `geo` had to be
+# removed. Otherwise, it is not possible to build the image, since the build
+# will fail with the error message:
+#
+# > rake aborted!
+# > ERROR: This installation of GitLab uses unsupported database names in 'config/database.yml': geo. The only supported ones are main, ci.
+#
+# This adjustment is hopefully only a temporary workaround (see 
+# <https://github.com/sameersbn/docker-gitlab/pull/2596>).
+
+#
+# PRODUCTION
+#
+production:
+  main:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_production
+    username: git
+    password: "secure password"
+    host: localhost
+    # load_balancing:
+    #   hosts:
+    #     - host1.example.com
+    #     - host2.example.com
+    #   discover:
+    #     nameserver: 1.2.3.4
+    #     port: 8600
+    #     record: secondary.postgresql.service.consul
+    #     interval: 300
+#  geo:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_geo_production
+#    username: git
+#    password: "secure password"
+#    host: localhost
+
+#
+# Development specific
+#
+development:
+  main:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_development
+    username: postgres
+    password: "secure password"
+    host: localhost
+    variables:
+      statement_timeout: 15s
+#  geo:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_geo_development
+#    username: postgres
+#    password: "secure password"
+#    host: localhost
+
+#
+# Staging specific
+#
+staging:
+  main:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_staging
+    username: git
+    password: "secure password"
+    host: localhost
+#  geo:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_geo_staging
+#    username: git
+#    password: "secure password"
+#    host: localhost
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  main:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_test
+    username: postgres
+    password:
+    host: localhost
+    prepared_statements: false
+    variables:
+      statement_timeout: 15s
+#  geo:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_geo_test
+#    username: postgres
+#    password:
+#    host: localhost
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 3d488e156..f35bc1555 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -187,7 +187,11 @@ chown -R ${GITLAB_USER}: ${GITLAB_HOME}
 # gitlab.yml and database.yml are required for `assets:precompile`
 exec_as_git cp ${GITLAB_INSTALL_DIR}/config/resque.yml.example ${GITLAB_INSTALL_DIR}/config/resque.yml
 exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_DIR}/config/gitlab.yml
-exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+#
+# Temporary workaround, see <https://github.com/sameersbn/docker-gitlab/pull/2596>
+#
+# exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+exec_as_git cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
 
 # Installs nodejs packages required to compile webpack
 exec_as_git yarn install --production --pure-lockfile

From ec2752ce888cf8337c9039e520e14dc0b616a054 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 2 Jul 2022 16:06:07 +0200
Subject: [PATCH 0775/1124] Upgrade GitLab CE to 15.1.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c35ba8135..f89f7fa71 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.1.1**
+
+- gitlab: upgrade CE to v15.1.1
+- gitaly: upgrade to v15.1.1
+
 **15.1.0**
 
 - gitlab: upgrade CE to v15.1.0
diff --git a/Dockerfile b/Dockerfile
index 6a9713416..0970def3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.1.0
+ARG VERSION=15.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.7.4 \
     GITLAB_PAGES_VERSION=1.59.0 \
-    GITALY_SERVER_VERSION=15.1.0 \
+    GITALY_SERVER_VERSION=15.1.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f6d4e59c1..014c8bc27 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.1.0
+# sameersbn/gitlab:15.1.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.0
+docker pull sameersbn/gitlab:15.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.1.0
+ sameersbn/gitlab:15.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.1.0
+    sameersbn/gitlab:15.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:sanitize
+    sameersbn/gitlab:15.1.1 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake db:setup
+    sameersbn/gitlab:15.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.0
+docker pull sameersbn/gitlab:15.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.1
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d14dfbac3..68a28303f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.0
+15.1.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index d4ffcce7b..382416158 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index edcd69cb5..990239a6e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 61b59a0c3..fdbb003bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 00aaa6f51..d35611a0c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.0
+docker pull sameersbn/gitlab:15.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.1.0
+sameersbn/gitlab:15.1.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9a5a027a7..0babdcd3d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7447fe332..82ecbc18d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.0
+    image: sameersbn/gitlab:15.1.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 192bb1d25..9efaf2b1b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.1.0
+        image: sameersbn/gitlab:15.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 2fed7b1d31d1fa0e8175b7c47ba4915aad22f751 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 6 Jul 2022 06:59:50 +0200
Subject: [PATCH 0776/1124] Upgrade GitLab CE to 15.1.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f89f7fa71..224b5a8f8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.1.2**
+
+- gitlab: upgrade CE to v15.1.2
+- gitaly: upgrade to v15.1.2
+
 **15.1.1**
 
 - gitlab: upgrade CE to v15.1.1
diff --git a/Dockerfile b/Dockerfile
index 0970def3a..217ae9e8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.1.1
+ARG VERSION=15.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.7.4 \
     GITLAB_PAGES_VERSION=1.59.0 \
-    GITALY_SERVER_VERSION=15.1.1 \
+    GITALY_SERVER_VERSION=15.1.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 014c8bc27..59f5650e1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.1.1
+# sameersbn/gitlab:15.1.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.1
+docker pull sameersbn/gitlab:15.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.1.1
+ sameersbn/gitlab:15.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.1.1
+    sameersbn/gitlab:15.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:sanitize
+    sameersbn/gitlab:15.1.2 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake db:setup
+    sameersbn/gitlab:15.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.1
+docker pull sameersbn/gitlab:15.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.2
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 68a28303f..0a75ce5d3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.1
+15.1.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 382416158..e25a779dc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 990239a6e..fb0063e7e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fdbb003bb..c78b2df74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d35611a0c..e5a0dd169 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.1
+docker pull sameersbn/gitlab:15.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.1.1
+sameersbn/gitlab:15.1.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 0babdcd3d..6625780b9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 82ecbc18d..ca03f2f82 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.1
+    image: sameersbn/gitlab:15.1.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9efaf2b1b..cfa41f125 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.1.1
+        image: sameersbn/gitlab:15.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 582580dd4688c3fb1dd07876c84486d5c25771bf Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Thu, 21 Jul 2022 11:28:05 +0100
Subject: [PATCH 0777/1124] Update to 15.1.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 224b5a8f8..c2b67d649 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.1.3**
+
+- gitlab: upgrade CE to v15.1.3
+- gitaly: upgrade to v15.1.3
+
 **15.1.2**
 
 - gitlab: upgrade CE to v15.1.2
diff --git a/Dockerfile b/Dockerfile
index 217ae9e8d..864249a9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.1.2
+ARG VERSION=15.1.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.7.4 \
     GITLAB_PAGES_VERSION=1.59.0 \
-    GITALY_SERVER_VERSION=15.1.2 \
+    GITALY_SERVER_VERSION=15.1.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 59f5650e1..4c7690420 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.1.2
+# sameersbn/gitlab:15.1.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.2
+docker pull sameersbn/gitlab:15.1.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.1.2
+ sameersbn/gitlab:15.1.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.1.2
+    sameersbn/gitlab:15.1.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:sanitize
+    sameersbn/gitlab:15.1.3 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake db:setup
+    sameersbn/gitlab:15.1.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.1.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.2
+docker pull sameersbn/gitlab:15.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.3
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0a75ce5d3..bc573c880 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.2
+15.1.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e25a779dc..4e9ac614d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index fb0063e7e..acac94769 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c78b2df74..c8b13ae7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e5a0dd169..78194f4d1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.2
+docker pull sameersbn/gitlab:15.1.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.1.2
+sameersbn/gitlab:15.1.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6625780b9..04d99a83f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ca03f2f82..20c7efbbc 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.2
+    image: sameersbn/gitlab:15.1.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index cfa41f125..14d2d639d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.1.2
+        image: sameersbn/gitlab:15.1.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 625af89abd53bb40e972d3d00b8200ef35366ae5 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Tue, 26 Jul 2022 15:58:53 +0100
Subject: [PATCH 0778/1124] Update to 15.2.0

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c2b67d649..6bd1f3517 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.2.0**
+
+- gitlab: upgrade CE to v15.2.0
+- gitaly: upgrade to v15.2.0
+
 **15.1.3**
 
 - gitlab: upgrade CE to v15.1.3
diff --git a/Dockerfile b/Dockerfile
index 864249a9e..fb5b8b8e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.1.3
+ARG VERSION=15.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.11 \
     GITLAB_SHELL_VERSION=14.7.4 \
     GITLAB_PAGES_VERSION=1.59.0 \
-    GITALY_SERVER_VERSION=15.1.3 \
+    GITALY_SERVER_VERSION=15.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4c7690420..2e8424fb7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.1.3
+# sameersbn/gitlab:15.2.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.3
+docker pull sameersbn/gitlab:15.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.1.3
+ sameersbn/gitlab:15.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.1.3
+    sameersbn/gitlab:15.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:sanitize
+    sameersbn/gitlab:15.2.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake db:setup
+    sameersbn/gitlab:15.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.1.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.3
+docker pull sameersbn/gitlab:15.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index bc573c880..6c43fc8ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.3
+15.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4e9ac614d..b34e78156 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index acac94769..42e694e91 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c8b13ae7b..991afd31b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 78194f4d1..788013fef 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.1.3
+docker pull sameersbn/gitlab:15.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.1.3
+sameersbn/gitlab:15.2.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 04d99a83f..01822610e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 20c7efbbc..4f1f4ada1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.1.3
+    image: sameersbn/gitlab:15.2.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 14d2d639d..a43cfccdd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.1.3
+        image: sameersbn/gitlab:15.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From f250da43b68a771191caebd646c3c7219440670b Mon Sep 17 00:00:00 2001
From: Antt1995 <antt1995@users.noreply.github.com>
Date: Wed, 27 Jul 2022 08:34:55 +0100
Subject: [PATCH 0779/1124] Update Dockerfile

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fb5b8b8e7..61c3cfcef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.11 \
-    GITLAB_SHELL_VERSION=14.7.4 \
-    GITLAB_PAGES_VERSION=1.59.0 \
+    GITLAB_SHELL_VERSION=14.9.0 \
+    GITLAB_PAGES_VERSION=1.61.0 \
     GITALY_SERVER_VERSION=15.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From 932ce294d93eb341c92185d00a1f219a19b61123 Mon Sep 17 00:00:00 2001
From: Antt1995 <antt1995@users.noreply.github.com>
Date: Wed, 27 Jul 2022 08:35:27 +0100
Subject: [PATCH 0780/1124] Update Changelog.md

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 Changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 6bd1f3517..ece6217ce 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,8 @@ This file only reflects the changes that are made in this image. Please refer to
 
 - gitlab: upgrade CE to v15.2.0
 - gitaly: upgrade to v15.2.0
+- gitlab-shell: upgrade to v14.9.0
+- gitlab-pages: upgrade to v1.61.0
 
 **15.1.3**
 

From fc190d53b4a91019df2c9feadbc63d90cab3e17c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 28 Jul 2022 13:39:50 +0200
Subject: [PATCH 0781/1124] Update golang to 1.17.12

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ece6217ce..76a501b23 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitaly: upgrade to v15.2.0
 - gitlab-shell: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.61.0
+- golang: upgrade to v1.17.12
 
 **15.1.3**
 
diff --git a/Dockerfile b/Dockerfile
index 61c3cfcef..fccaf7fae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=15.2.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
-    GOLANG_VERSION=1.17.11 \
+    GOLANG_VERSION=1.17.12 \
     GITLAB_SHELL_VERSION=14.9.0 \
     GITLAB_PAGES_VERSION=1.61.0 \
     GITALY_SERVER_VERSION=15.2.0 \

From d7b33653c63132b8e7ed3a7a1526706f7392ad8e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 28 Jul 2022 13:40:19 +0200
Subject: [PATCH 0782/1124] Update release notes.

---
 scripts/release-notes.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index bc5140e16..ec84e252d 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -42,13 +42,19 @@ You are kindly invited to provide contributions.
 
 ### Version-specific instructions for upgrades
 
-Please consider the version specific upgrading instructions for [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500) and [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510)
+Please consider the version specific upgrading instructions for 
+* [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500),
+* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510), and
+* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1520):
 
 * Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version.
 * If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing.
 * The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload.
 * The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0.
 * In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later.
+* GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation.
+* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.0.
+
 
 ## Contributing
 

From db0a0fff018fd41c3be39888033cc9e73530f6d9 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Thu, 28 Jul 2022 22:45:12 +0100
Subject: [PATCH 0783/1124] Update to 15.2.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 scripts/release-notes.sh                |  4 +-
 12 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 76a501b23..913eb9204 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.2.1**
+
+- gitlab: upgrade CE to v15.2.1
+- gitaly: upgrade to v15.2.1
+
 **15.2.0**
 
 - gitlab: upgrade CE to v15.2.0
diff --git a/Dockerfile b/Dockerfile
index fccaf7fae..2e2246146 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.2.0
+ARG VERSION=15.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.12 \
     GITLAB_SHELL_VERSION=14.9.0 \
     GITLAB_PAGES_VERSION=1.61.0 \
-    GITALY_SERVER_VERSION=15.2.0 \
+    GITALY_SERVER_VERSION=15.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2e8424fb7..1f174253a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.2.0
+# sameersbn/gitlab:15.2.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.0
+docker pull sameersbn/gitlab:15.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.2.0
+ sameersbn/gitlab:15.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.2.0
+    sameersbn/gitlab:15.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:sanitize
+    sameersbn/gitlab:15.2.1 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake db:setup
+    sameersbn/gitlab:15.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.0
+docker pull sameersbn/gitlab:15.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.1
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6c43fc8ae..2054e837b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.0
+15.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b34e78156..ec93ae548 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 42e694e91..b80e68929 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 991afd31b..98b6f5b52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 788013fef..6e81cdee2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.0
+docker pull sameersbn/gitlab:15.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.2.0
+sameersbn/gitlab:15.2.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 01822610e..881f9a038 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4f1f4ada1..46e8ebaa9 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.0
+    image: sameersbn/gitlab:15.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a43cfccdd..4bacd0c05 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.2.0
+        image: sameersbn/gitlab:15.2.1
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index ec84e252d..169312fc4 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -51,9 +51,9 @@ Please consider the version specific upgrading instructions for
 * If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing.
 * The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload.
 * The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0.
-* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later.
+* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.1 or later.
 * GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation.
-* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.0.
+* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.1.
 
 
 ## Contributing

From 5839401217c7e4c50cb3a02fe4365bc3ffe8f95a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 29 Jul 2022 18:23:16 +0200
Subject: [PATCH 0784/1124] Upgrade to gitlab-pages v1.61.1

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 913eb9204..b8587ee41 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 
 - gitlab: upgrade CE to v15.2.1
 - gitaly: upgrade to v15.2.1
+- gitlab-pages: upgrade to v1.61.1
 
 **15.2.0**
 
diff --git a/Dockerfile b/Dockerfile
index 2e2246146..e8d69c64b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.12 \
     GITLAB_SHELL_VERSION=14.9.0 \
-    GITLAB_PAGES_VERSION=1.61.0 \
+    GITLAB_PAGES_VERSION=1.61.1 \
     GITALY_SERVER_VERSION=15.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \

From b063c95089f0bd07bbae33e098ca9a9a2977e55e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 1 Aug 2022 21:05:50 +0200
Subject: [PATCH 0785/1124] Upgrade GitLab CE to 15.2.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b8587ee41..dd33ae09d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.2.2**
+
+- gitlab: upgrade CE to v15.2.2
+- gitaly: upgrade to v15.2.2
+- golang: upgrade to v1.17.13
+
 **15.2.1**
 
 - gitlab: upgrade CE to v15.2.1
diff --git a/Dockerfile b/Dockerfile
index e8d69c64b..9fb69b31b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20220531
 
-ARG VERSION=15.2.1
+ARG VERSION=15.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
-    GOLANG_VERSION=1.17.12 \
+    GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.9.0 \
     GITLAB_PAGES_VERSION=1.61.1 \
-    GITALY_SERVER_VERSION=15.2.1 \
+    GITALY_SERVER_VERSION=15.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1f174253a..ed9eb26fa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.2.1
+# sameersbn/gitlab:15.2.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.1
+docker pull sameersbn/gitlab:15.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.2.1
+ sameersbn/gitlab:15.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.2.1
+    sameersbn/gitlab:15.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:sanitize
+    sameersbn/gitlab:15.2.2 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake db:setup
+    sameersbn/gitlab:15.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.1
+docker pull sameersbn/gitlab:15.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.2
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2054e837b..ef10e29ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.1
+15.2.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ec93ae548..86165d74d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b80e68929..a009859cd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 98b6f5b52..8af283066 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6e81cdee2..9c03915b2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.1
+docker pull sameersbn/gitlab:15.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.2.1
+sameersbn/gitlab:15.2.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 881f9a038..f517aa47c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 46e8ebaa9..399a81010 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.1
+    image: sameersbn/gitlab:15.2.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4bacd0c05..51db2d55f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.2.1
+        image: sameersbn/gitlab:15.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From a90b508484d3c4cb06a77698769bfe9e51370656 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 22 Aug 2022 19:11:15 +0200
Subject: [PATCH 0786/1124] Upgrade GitLab CE to 15.3.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dd33ae09d..9e2d8e90c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.3.0**
+
+- gitlab: upgrade CE to v15.3.0
+- gitaly: upgrade to v15.3.0
+- gitlab-shell: upgrade to v14.10.0
+- gitlab-pages: upgrade to v1.62.0
+- ubuntu: upgrade to focal-20220801
+
 **15.2.2**
 
 - gitlab: upgrade CE to v15.2.2
diff --git a/Dockerfile b/Dockerfile
index 9fb69b31b..583549f85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20220531
+FROM ubuntu:focal-20220801
 
-ARG VERSION=15.2.2
+ARG VERSION=15.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.13 \
-    GITLAB_SHELL_VERSION=14.9.0 \
-    GITLAB_PAGES_VERSION=1.61.1 \
-    GITALY_SERVER_VERSION=15.2.2 \
+    GITLAB_SHELL_VERSION=14.10.0 \
+    GITLAB_PAGES_VERSION=1.62.0 \
+    GITALY_SERVER_VERSION=15.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ed9eb26fa..e184d1ab6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.2.2
+# sameersbn/gitlab:15.3.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.2
+docker pull sameersbn/gitlab:15.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.2.2
+ sameersbn/gitlab:15.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.2.2
+    sameersbn/gitlab:15.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:sanitize
+    sameersbn/gitlab:15.3.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake db:setup
+    sameersbn/gitlab:15.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.2
+docker pull sameersbn/gitlab:15.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ef10e29ef..5ff58dbcd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.2
+15.3.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 86165d74d..a06020e2e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a009859cd..e7d8f576c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 8af283066..bc3820b76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9c03915b2..78705ebc6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.2.2
+docker pull sameersbn/gitlab:15.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.2.2
+sameersbn/gitlab:15.3.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f517aa47c..fecce01f9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 399a81010..d627b6022 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.2.2
+    image: sameersbn/gitlab:15.3.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 51db2d55f..fd25cf4c2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.2.2
+        image: sameersbn/gitlab:15.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From b46af43bab74d99aee9396193893ad0abf67b6ac Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 23 Aug 2022 15:52:59 +0200
Subject: [PATCH 0787/1124] Upgrade GitLab CE to 15.3.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9e2d8e90c..6c5cb5de9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.3.1**
+
+- gitlab: upgrade CE to v15.3.1
+- gitaly: upgrade to v15.3.1
+
 **15.3.0**
 
 - gitlab: upgrade CE to v15.3.0
diff --git a/Dockerfile b/Dockerfile
index 583549f85..9ea23c737 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220801
 
-ARG VERSION=15.3.0
+ARG VERSION=15.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.3.0 \
+    GITALY_SERVER_VERSION=15.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e184d1ab6..2f769d9e2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.3.0
+# sameersbn/gitlab:15.3.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.0
+docker pull sameersbn/gitlab:15.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.3.0
+ sameersbn/gitlab:15.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.3.0
+    sameersbn/gitlab:15.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:sanitize
+    sameersbn/gitlab:15.3.1 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake db:setup
+    sameersbn/gitlab:15.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.0
+docker pull sameersbn/gitlab:15.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.1
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5ff58dbcd..2d67a9de1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.0
+15.3.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a06020e2e..af238a83f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e7d8f576c..ef7863b7c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index bc3820b76..885b6bcf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 78705ebc6..0fa9e45e5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.0
+docker pull sameersbn/gitlab:15.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.3.0
+sameersbn/gitlab:15.3.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fecce01f9..3a3b556fe 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d627b6022..76b2435d8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.0
+    image: sameersbn/gitlab:15.3.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index fd25cf4c2..0251c190c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.3.0
+        image: sameersbn/gitlab:15.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From fbebf7a3fe7cc63e958048a39488e149966aa424 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 31 Aug 2022 17:19:24 +0200
Subject: [PATCH 0788/1124] Upgrade GitLab CE to 15.3.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6c5cb5de9..22477c438 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.3.2**
+
+- gitlab: upgrade CE to v15.3.2
+- gitaly: upgrade to v15.3.2
+
 **15.3.1**
 
 - gitlab: upgrade CE to v15.3.1
diff --git a/Dockerfile b/Dockerfile
index 9ea23c737..98e1099e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220801
 
-ARG VERSION=15.3.1
+ARG VERSION=15.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.3.1 \
+    GITALY_SERVER_VERSION=15.3.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2f769d9e2..beaa59b92 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.3.1
+# sameersbn/gitlab:15.3.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.1
+docker pull sameersbn/gitlab:15.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.3.1
+ sameersbn/gitlab:15.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.3.1
+    sameersbn/gitlab:15.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:sanitize
+    sameersbn/gitlab:15.3.2 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake db:setup
+    sameersbn/gitlab:15.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.1
+docker pull sameersbn/gitlab:15.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.2
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2d67a9de1..bb3dda5bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.1
+15.3.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index af238a83f..b494141ff 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ef7863b7c..a4b17bb38 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 885b6bcf0..63605435c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0fa9e45e5..c82542169 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.1
+docker pull sameersbn/gitlab:15.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.3.1
+sameersbn/gitlab:15.3.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3a3b556fe..0d375b075 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 76b2435d8..32662d308 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.1
+    image: sameersbn/gitlab:15.3.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0251c190c..1e96a2b3f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.3.1
+        image: sameersbn/gitlab:15.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From be9273c87f63ed0b1cc2f0b38a58d7f497bb0db6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 1 Sep 2022 20:25:52 +0200
Subject: [PATCH 0789/1124] Revise release notes

---
 scripts/release-notes.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 169312fc4..a9db77813 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -38,23 +38,9 @@ For installation and usage instructions please refer to the [README](https://git
 
 Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent.
 
-You are kindly invited to provide contributions.
-
-### Version-specific instructions for upgrades
-
-Please consider the version specific upgrading instructions for 
-* [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500),
-* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510), and
-* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1520):
-
-* Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version.
-* If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing.
-* The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload.
-* The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0.
-* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.1 or later.
-* GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation.
-* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.1.
+Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) *before* upgrading your GitLab CE instance!
 
+You are kindly invited to provide contributions.
 
 ## Contributing
 

From 76860a094dfd0735571048c4a08719becaebad28 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Sat, 3 Sep 2022 18:16:30 +0100
Subject: [PATCH 0790/1124] Update to 15.3.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 22477c438..52cfb76b7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.3.3**
+
+- gitlab: upgrade CE to v15.3.3
+- gitaly: upgrade to v15.3.3
+
 **15.3.2**
 
 - gitlab: upgrade CE to v15.3.2
diff --git a/Dockerfile b/Dockerfile
index 98e1099e2..dc35c89c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220801
 
-ARG VERSION=15.3.2
+ARG VERSION=15.3.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.3.2 \
+    GITALY_SERVER_VERSION=15.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index beaa59b92..6490c097a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.3.2
+# sameersbn/gitlab:15.3.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.2
+docker pull sameersbn/gitlab:15.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.3.2
+ sameersbn/gitlab:15.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.3.2
+    sameersbn/gitlab:15.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:sanitize
+    sameersbn/gitlab:15.3.3 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake db:setup
+    sameersbn/gitlab:15.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.2
+docker pull sameersbn/gitlab:15.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.3
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index bb3dda5bd..87b5b94fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.2
+15.3.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b494141ff..f199bfbdb 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a4b17bb38..f41e9804e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 63605435c..36777a9ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c82542169..ea4a05e53 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.2
+docker pull sameersbn/gitlab:15.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.3.2
+sameersbn/gitlab:15.3.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 0d375b075..523ec18e2 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 32662d308..d3fbcaf7c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.2
+    image: sameersbn/gitlab:15.3.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1e96a2b3f..faa45415b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.3.2
+        image: sameersbn/gitlab:15.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 8b9ca622f98e3cedbecfcfcd244393f30846f461 Mon Sep 17 00:00:00 2001
From: Ivan Baranov <ivan.baranov@t1a.com>
Date: Mon, 5 Sep 2022 21:46:20 +0900
Subject: [PATCH 0791/1124] Tested support for azure_activedirectory_v2

---
 README.md                                 | 18 ++++++++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml |  6 ++++++
 assets/runtime/env-defaults               |  6 ++++++
 assets/runtime/functions                  | 19 ++++++++++++++++++-
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index beaa59b92..2b802be67 100644
--- a/README.md
+++ b/README.md
@@ -689,6 +689,8 @@ Once you have the Client ID, Client secret and Tenant ID generated, configure th
 
 For example, if your Client ID is `xxx`, the Client secret is `yyy` and the Tenant ID is `zzz`, then adding `--env 'OAUTH_AZURE_API_KEY=xxx' --env 'OAUTH_AZURE_API_SECRET=yyy' --env 'OAUTH_AZURE_TENANT_ID=zzz'` to the docker run command enables support for Microsoft Azure OAuth.
 
+Also you can configure v2 endpoint (`azure_activedirectory_v2`) by using `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID`, `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET` and `OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID` environment variables. Optionally you can change label of login button using the `OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL`.
+
 ##### Generic OAuth2
 
 To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure.
@@ -2194,6 +2196,22 @@ Azure Client secret. No defaults.
 
 Azure Tenant ID. No defaults.
 
+#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID`
+
+Client ID for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults.
+
+#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET`
+
+Client secret for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults.
+
+#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID`
+
+Tenant ID for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults.
+
+#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL`
+
+Optional label for login button for `azure_activedirectory_v2`. Defaults to `Azure AD v2`
+
 ##### `OAUTH2_GENERIC_APP_ID`
 
 Your OAuth2 App ID. No defaults.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index a0c478918..49502277e 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1023,6 +1023,12 @@ production: &base
             client_id: '{{OAUTH_AZURE_API_KEY}}',
             client_secret: '{{OAUTH_AZURE_API_SECRET}}',
             tenant_id: '{{OAUTH_AZURE_TENANT_ID}}' } }
+      - { name: 'azure_activedirectory_v2',
+          label: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL}}',
+          args: {
+            client_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID}}',
+            client_secret: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET}}',
+            tenant_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}' } }
 
     # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
     # cas3:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 908d368fc..46624eafc 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -479,6 +479,12 @@ OAUTH_AZURE_API_KEY=${OAUTH_AZURE_API_KEY:-}
 OAUTH_AZURE_API_SECRET=${OAUTH_AZURE_API_SECRET:-}
 OAUTH_AZURE_TENANT_ID=${OAUTH_AZURE_TENANT_ID:-}
 
+## AZURE Active Directory V2 endpoint
+OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL:-'Azure AD v2'}
+OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID:-}
+OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET:-}
+OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID:-}
+
 ### SAML
 case $GITLAB_HTTPS in
   true)
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 07477a6ae..90dbe1913 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -688,6 +688,22 @@ gitlab_configure_oauth_azure() {
   fi
 }
 
+gitlab_configure_oauth_azure_ad_v2() {
+  # we don't check if OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL because it is optional
+  if [[ -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID} && \
+        -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET} && \
+        -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID} ]]; then
+    echo "Configuring gitlab::oauth::azure_activedirectory_v2..."
+    update_template ${GITLAB_CONFIG} \
+      OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL \
+      OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID \
+      OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET \
+      OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID
+  else
+    exec_as_git sed -i "/name: 'azure_activedirectory_v2'/,/{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}/d" ${GITLAB_CONFIG}
+  fi
+}
+
 gitlab_configure_oauth() {
   echo "Configuring gitlab::oauth..."
 
@@ -704,6 +720,7 @@ gitlab_configure_oauth() {
   gitlab_configure_oauth_crowd
   gitlab_configure_oauth_auth0
   gitlab_configure_oauth_azure
+  gitlab_configure_oauth_azure_ad_v2
 
   OAUTH_ENABLED=${OAUTH_ENABLED:-false}
   update_template ${GITLAB_CONFIG} \
@@ -716,7 +733,7 @@ gitlab_configure_oauth() {
     OAUTH_EXTERNAL_PROVIDERS
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
-    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|oauth2_generic|$OAUTH2_GENERIC_NAME)
+    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME)
       update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER
       ;;
     *)

From 5e20678aa823855a57936b783adebfa62beb095b Mon Sep 17 00:00:00 2001
From: Antt1995 <antt1995@users.noreply.github.com>
Date: Fri, 9 Sep 2022 15:02:10 +0100
Subject: [PATCH 0792/1124] Update README.md


From 6766c014648ec1fa388f434897c9a7ce3e17e017 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Wed, 21 Sep 2022 15:03:34 +0100
Subject: [PATCH 0793/1124] Update to Gitlab CE 15.4.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 52cfb76b7..fa569d946 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.4.0**
+
+- gitlab: upgrade CE to v15.4.0
+- gitaly: upgrade to v15.4.0
+- ubuntu: upgrade tofocal-20220826
+
 **15.3.3**
 
 - gitlab: upgrade CE to v15.3.3
diff --git a/Dockerfile b/Dockerfile
index dc35c89c4..19a4e3dca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20220801
+FROM ubuntu:focal-20220826
 
-ARG VERSION=15.3.3
+ARG VERSION=15.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.3.3 \
+    GITALY_SERVER_VERSION=15.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6490c097a..9f5c20011 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.3.3
+# sameersbn/gitlab:15.4.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.3
+docker pull sameersbn/gitlab:15.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.3.3
+ sameersbn/gitlab:15.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -758,14 +758,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.3.3
+    sameersbn/gitlab:15.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:sanitize
+    sameersbn/gitlab:15.4.0 app:sanitize
 ```
 
 #### Piwik
@@ -2407,7 +2407,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2442,14 +2442,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake db:setup
+    sameersbn/gitlab:15.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2507,7 +2507,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.3
+docker pull sameersbn/gitlab:15.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2605,7 +2605,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.0
 ```
 
 ### Shell Access
@@ -2643,7 +2643,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 87b5b94fc..c915b5db7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.3
+15.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f199bfbdb..33da2b2ab 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f41e9804e..518c0409e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 36777a9ea..74340f257 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ea4a05e53..346996c5a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.3.3
+docker pull sameersbn/gitlab:15.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.3.3
+sameersbn/gitlab:15.4.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 523ec18e2..26d08d6ae 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d3fbcaf7c..12fea873f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.3.3
+    image: sameersbn/gitlab:15.4.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index faa45415b..4acf7c553 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.3.3
+        image: sameersbn/gitlab:15.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From b416245565ce582266fdaea33db8b17f7e3aff33 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Fri, 30 Sep 2022 14:46:03 +0100
Subject: [PATCH 0794/1124] Update to Gitlab CE 15.4.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fa569d946..aac1bebcd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.4.1**
+
+- gitlab: upgrade CE to v15.4.1
+- gitaly: upgrade to v15.4.1
+
 **15.4.0**
 
 - gitlab: upgrade CE to v15.4.0
diff --git a/Dockerfile b/Dockerfile
index 19a4e3dca..4f6fde900 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220826
 
-ARG VERSION=15.4.0
+ARG VERSION=15.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.4.0 \
+    GITALY_SERVER_VERSION=15.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3c83ccab1..229a0e0f7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.4.0
+# sameersbn/gitlab:15.4.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.0
+docker pull sameersbn/gitlab:15.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.4.0
+ sameersbn/gitlab:15.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.4.0
+    sameersbn/gitlab:15.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:sanitize
+    sameersbn/gitlab:15.4.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake db:setup
+    sameersbn/gitlab:15.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.0
+docker pull sameersbn/gitlab:15.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c915b5db7..72e9701a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.0
+15.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 33da2b2ab..6bba87ae9 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 518c0409e..45c5161e1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 74340f257..4fad29390 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 346996c5a..05842693d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.0
+docker pull sameersbn/gitlab:15.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.4.0
+sameersbn/gitlab:15.4.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 26d08d6ae..4b7c08b12 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 12fea873f..4f12ba318 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.0
+    image: sameersbn/gitlab:15.4.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4acf7c553..4e88fc551 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.4.0
+        image: sameersbn/gitlab:15.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From f38730dca47c52a2ae90080040f4586c54b9050f Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Wed, 5 Oct 2022 14:07:14 +0100
Subject: [PATCH 0795/1124] Upgrade GitLab CE to 15.4.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aac1bebcd..3f47ea93d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.4.2**
+
+- gitlab: upgrade CE to v15.4.2
+- gitaly: upgrade to v15.4.2
+
 **15.4.1**
 
 - gitlab: upgrade CE to v15.4.1
diff --git a/Dockerfile b/Dockerfile
index 4f6fde900..09cb8a2f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220826
 
-ARG VERSION=15.4.1
+ARG VERSION=15.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.4.1 \
+    GITALY_SERVER_VERSION=15.4.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 229a0e0f7..63149298f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.4.1
+# sameersbn/gitlab:15.4.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.1
+docker pull sameersbn/gitlab:15.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.4.1
+ sameersbn/gitlab:15.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.4.1
+    sameersbn/gitlab:15.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:sanitize
+    sameersbn/gitlab:15.4.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake db:setup
+    sameersbn/gitlab:15.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.1
+docker pull sameersbn/gitlab:15.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 72e9701a3..fcf934d16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.1
+15.4.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6bba87ae9..6fec5668f 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 45c5161e1..b03690e5c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fad29390..6e43bde40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 05842693d..9734fe22f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.1
+docker pull sameersbn/gitlab:15.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.4.1
+sameersbn/gitlab:15.4.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4b7c08b12..8d9fad54c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4f12ba318..c8cb2eec6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.1
+    image: sameersbn/gitlab:15.4.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4e88fc551..58b153d74 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.4.1
+        image: sameersbn/gitlab:15.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From f408585d8b2369e89c82a7a707dfd71f22dcf72b Mon Sep 17 00:00:00 2001
From: kkkkkks0 <heimo9397@gmail.com>
Date: Thu, 20 Oct 2022 18:58:03 +0800
Subject: [PATCH 0796/1124] fixes sameersbn#2645

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 90dbe1913..787ce5c8a 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1687,7 +1687,7 @@ generate_ssh_key() {
 }
 
 generate_ssh_host_keys() {
-  sed -i "s|^[#]*MaxStartups 10:30:60|MaxStartups ${GITLAB_SSH_MAXSTARTUPS}|" /etc/ssh/sshd_config
+  sed -i "s|^[#]*MaxStartups[^$]*|MaxStartups ${GITLAB_SSH_MAXSTARTUPS}|" /etc/ssh/sshd_config
   sed -i "s|#HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config
   if [[ ! -e ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key ]]; then
     echo -n "Generating OpenSSH host keys... "

From a95c0195930845170c0ea6b1d36730a4eeafb6d3 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Thu, 20 Oct 2022 15:04:33 +0100
Subject: [PATCH 0797/1124] Upgrade to GitLab CE 15.4.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3f47ea93d..753274407 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.4.3**
+
+- gitlab: upgrade CE to v15.4.3
+- gitaly: upgrade to v15.4.3
+- ubuntu: upgrade to focal-20220922
+
 **15.4.2**
 
 - gitlab: upgrade CE to v15.4.2
diff --git a/Dockerfile b/Dockerfile
index 09cb8a2f8..26746f921 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20220826
+FROM ubuntu:focal-20220922
 
-ARG VERSION=15.4.2
+ARG VERSION=15.4.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.4.2 \
+    GITALY_SERVER_VERSION=15.4.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 63149298f..da835d665 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.4.2
+# sameersbn/gitlab:15.4.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.2
+docker pull sameersbn/gitlab:15.4.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.4.2
+ sameersbn/gitlab:15.4.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.4.2
+    sameersbn/gitlab:15.4.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:sanitize
+    sameersbn/gitlab:15.4.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake db:setup
+    sameersbn/gitlab:15.4.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.4.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.2
+docker pull sameersbn/gitlab:15.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fcf934d16..261c9b075 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.2
+15.4.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6fec5668f..da24cb962 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b03690e5c..75a5bcd31 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e43bde40..07685e5e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9734fe22f..bf488cf48 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.2
+docker pull sameersbn/gitlab:15.4.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.4.2
+sameersbn/gitlab:15.4.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8d9fad54c..f57a30fae 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c8cb2eec6..8d5521782 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.2
+    image: sameersbn/gitlab:15.4.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 58b153d74..2eb1a3589 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.4.2
+        image: sameersbn/gitlab:15.4.3
         env:
         - name: TZ
           value: Asia/Kolkata

From f37416f858d3186c159f92ef04c501bceb6ed9e8 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Fri, 21 Oct 2022 09:55:18 +0100
Subject: [PATCH 0798/1124] Upgrade to GitLab CE 15.5.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 753274407..7a5bf02d4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.5.0**
+
+- gitlab: upgrade CE to v15.5.0
+- gitaly: upgrade to v15.5.0
+
+
 **15.4.3**
 
 - gitlab: upgrade CE to v15.4.3
diff --git a/Dockerfile b/Dockerfile
index 26746f921..b1895d284 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220922
 
-ARG VERSION=15.4.3
+ARG VERSION=15.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.10.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.4.3 \
+    GITALY_SERVER_VERSION=15.5.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index da835d665..9a732da7d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.4.3
+# sameersbn/gitlab:15.5.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.3
+docker pull sameersbn/gitlab:15.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.4.3
+ sameersbn/gitlab:15.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.4.3
+    sameersbn/gitlab:15.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:sanitize
+    sameersbn/gitlab:15.5.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake db:setup
+    sameersbn/gitlab:15.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.4.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.3
+docker pull sameersbn/gitlab:15.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 261c9b075..188dd74f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.3
+15.5.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index da24cb962..4e7b0eae4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 75a5bcd31..23991fa68 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 07685e5e0..a0983b7a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bf488cf48..e73c0330a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.4.3
+docker pull sameersbn/gitlab:15.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.4.3
+sameersbn/gitlab:15.5.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f57a30fae..1e9e631fc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8d5521782..e4495d4fb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.4.3
+    image: sameersbn/gitlab:15.5.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2eb1a3589..c4a0ac196 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.4.3
+        image: sameersbn/gitlab:15.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 090d213642a1122d807292a9f31371696a7b44b7 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Sun, 23 Oct 2022 12:33:33 +0100
Subject: [PATCH 0799/1124] Shell to 14.12.0

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 7a5bf02d4..c3a724b71 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 
 - gitlab: upgrade CE to v15.5.0
 - gitaly: upgrade to v15.5.0
+- gitlab-shell: upgrade to v14.12.0
 
 
 **15.4.3**
diff --git a/Dockerfile b/Dockerfile
index b1895d284..8fe5ee1f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.13 \
-    GITLAB_SHELL_VERSION=14.10.0 \
+    GITLAB_SHELL_VERSION=14.12.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
     GITALY_SERVER_VERSION=15.5.0 \
     GITLAB_USER="git" \

From ae818faeaf2ed110facbe3b6de4a9a3210fbf14a Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Tue, 25 Oct 2022 09:35:04 +0100
Subject: [PATCH 0800/1124] Upgrade to GitLab CE 15.5.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c3a724b71..2367d3ae8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.5.1**
+
+- gitlab: upgrade CE to v15.5.1
+- gitaly: upgrade to v15.5.1
+
 **15.5.0**
 
 - gitlab: upgrade CE to v15.5.0
diff --git a/Dockerfile b/Dockerfile
index 8fe5ee1f3..ded0cda28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220922
 
-ARG VERSION=15.5.0
+ARG VERSION=15.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.12.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.5.0 \
+    GITALY_SERVER_VERSION=15.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9a732da7d..51680cd89 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.5.0
+# sameersbn/gitlab:15.5.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.0
+docker pull sameersbn/gitlab:15.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.5.0
+ sameersbn/gitlab:15.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.5.0
+    sameersbn/gitlab:15.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:sanitize
+    sameersbn/gitlab:15.5.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake db:setup
+    sameersbn/gitlab:15.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.0
+docker pull sameersbn/gitlab:15.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 188dd74f5..2e0b428c4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.0
+15.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4e7b0eae4..f9d264970 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 23991fa68..51b7c2354 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a0983b7a6..5b0d4eef3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e73c0330a..3d2bb02c2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.0
+docker pull sameersbn/gitlab:15.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.5.0
+sameersbn/gitlab:15.5.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1e9e631fc..e732804b1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e4495d4fb..6824365c1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.0
+    image: sameersbn/gitlab:15.5.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c4a0ac196..acea9985d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.5.0
+        image: sameersbn/gitlab:15.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 3cad3ba81383d1cd358310a2327c74284b8cdd0b Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Wed, 2 Nov 2022 15:52:59 +0000
Subject: [PATCH 0801/1124] Upgrade to GitLab CE 15.5.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2367d3ae8..0e2a50e25 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.5.2**
+
+- gitlab: upgrade CE to v15.5.2
+- gitaly: upgrade to v15.5.2
+
 **15.5.1**
 
 - gitlab: upgrade CE to v15.5.1
diff --git a/Dockerfile b/Dockerfile
index ded0cda28..415a8ef7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20220922
 
-ARG VERSION=15.5.1
+ARG VERSION=15.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.12.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.5.1 \
+    GITALY_SERVER_VERSION=15.5.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 51680cd89..18468586e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.5.1
+# sameersbn/gitlab:15.5.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.1
+docker pull sameersbn/gitlab:15.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.5.1
+ sameersbn/gitlab:15.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.5.1
+    sameersbn/gitlab:15.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:sanitize
+    sameersbn/gitlab:15.5.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake db:setup
+    sameersbn/gitlab:15.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.1
+docker pull sameersbn/gitlab:15.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2e0b428c4..9af1d968a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.1
+15.5.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f9d264970..37f2c1836 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 51b7c2354..f1c147c18 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b0d4eef3..97dcc316f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3d2bb02c2..1e60b9745 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.1
+docker pull sameersbn/gitlab:15.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.5.1
+sameersbn/gitlab:15.5.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e732804b1..298501714 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6824365c1..655edc467 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.1
+    image: sameersbn/gitlab:15.5.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index acea9985d..c4a280ea9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.5.1
+        image: sameersbn/gitlab:15.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From c7499484a9f7cc338a1a1355fb050fde7c1fa9e4 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Thu, 3 Nov 2022 21:52:02 +0000
Subject: [PATCH 0802/1124] Ubuntu

- ubuntu: upgrade to focal-20221019
---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 0e2a50e25..b2b4b07b4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to
 
 - gitlab: upgrade CE to v15.5.2
 - gitaly: upgrade to v15.5.2
+- ubuntu: upgrade to focal-20221019
 
 **15.5.1**
 
diff --git a/Dockerfile b/Dockerfile
index 415a8ef7e..4baa00198 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220922
+FROM ubuntu:focal-20221019
 
 ARG VERSION=15.5.2
 

From 590148a121109d85041fc92460f1ae277dcfe363 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Wed, 9 Nov 2022 17:09:28 +0000
Subject: [PATCH 0803/1124] Upgrade to GitLab CE 15.5.3

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b2b4b07b4..30d1c3579 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.5.3**
+
+- gitlab: upgrade CE to v15.5.3
+- gitaly: upgrade to v15.5.3
+
 **15.5.2**
 
 - gitlab: upgrade CE to v15.5.2
diff --git a/Dockerfile b/Dockerfile
index 4baa00198..798ba3de8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20221019
 
-ARG VERSION=15.5.2
+ARG VERSION=15.5.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.12.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.5.2 \
+    GITALY_SERVER_VERSION=15.5.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 18468586e..c8d47aacb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.5.2
+# sameersbn/gitlab:15.5.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.2
+docker pull sameersbn/gitlab:15.5.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.5.2
+ sameersbn/gitlab:15.5.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.5.2
+    sameersbn/gitlab:15.5.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:sanitize
+    sameersbn/gitlab:15.5.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake db:setup
+    sameersbn/gitlab:15.5.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.5.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.2
+docker pull sameersbn/gitlab:15.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9af1d968a..23a751eec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.2
+15.5.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 37f2c1836..bc5cef780 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f1c147c18..fd2a0c2a2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 97dcc316f..5c02af0f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1e60b9745..03f0a982d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.2
+docker pull sameersbn/gitlab:15.5.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.5.2
+sameersbn/gitlab:15.5.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 298501714..73f9028ef 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 655edc467..0da1f71b1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.2
+    image: sameersbn/gitlab:15.5.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c4a280ea9..12c6ce46e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.5.2
+        image: sameersbn/gitlab:15.5.3
         env:
         - name: TZ
           value: Asia/Kolkata

From a8037b726ef92381bf8fa0507f4daf0ed720c333 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Mon, 14 Nov 2022 11:27:01 +0000
Subject: [PATCH 0804/1124] Upgrade to GitLab CE 15.5.4

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 30d1c3579..b484d6602 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.5.4**
+
+- gitlab: upgrade CE to v15.5.4
+- gitaly: upgrade to v15.5.4
+
 **15.5.3**
 
 - gitlab: upgrade CE to v15.5.3
diff --git a/Dockerfile b/Dockerfile
index 798ba3de8..5f2ee5961 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20221019
 
-ARG VERSION=15.5.3
+ARG VERSION=15.5.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.17.13 \
     GITLAB_SHELL_VERSION=14.12.0 \
     GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.5.3 \
+    GITALY_SERVER_VERSION=15.5.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c8d47aacb..0b1ebf6f3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.5.3
+# sameersbn/gitlab:15.5.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.3
+docker pull sameersbn/gitlab:15.5.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.5.3
+ sameersbn/gitlab:15.5.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.5.3
+    sameersbn/gitlab:15.5.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:sanitize
+    sameersbn/gitlab:15.5.4 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake db:setup
+    sameersbn/gitlab:15.5.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.5.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.5.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.3
+docker pull sameersbn/gitlab:15.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.4
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 23a751eec..de0797d94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.3
+15.5.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index bc5cef780..896a31f75 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index fd2a0c2a2..415d67139 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c02af0f5..9d1c5751d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 03f0a982d..6dfd95ef0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.3
+docker pull sameersbn/gitlab:15.5.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.5.3
+sameersbn/gitlab:15.5.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 73f9028ef..e6e944f0f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0da1f71b1..2f0f5226a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.3
+    image: sameersbn/gitlab:15.5.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 12c6ce46e..c8554618d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.5.3
+        image: sameersbn/gitlab:15.5.4
         env:
         - name: TZ
           value: Asia/Kolkata

From a6ef2a3464a337e553568be98f95309013da1280 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Tue, 22 Nov 2022 09:50:15 +0000
Subject: [PATCH 0805/1124] Upgrade to GitLab CE 15.6.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b484d6602..06c48ca02 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.6.0**
+
+- gitlab: upgrade CE to v15.6.0
+- gitaly: upgrade to v15.6.0
+- gitlab-shell: upgrade to v14.13.0
+- gitlab-pages: upgrade to v1.63.0
+
 **15.5.4**
 
 - gitlab: upgrade CE to v15.5.4
diff --git a/Dockerfile b/Dockerfile
index 5f2ee5961..7d1fad22f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221019
 
-ARG VERSION=15.5.4
+ARG VERSION=15.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
     GOLANG_VERSION=1.17.13 \
-    GITLAB_SHELL_VERSION=14.12.0 \
-    GITLAB_PAGES_VERSION=1.62.0 \
-    GITALY_SERVER_VERSION=15.5.4 \
+    GITLAB_SHELL_VERSION=14.13.0 \
+    GITLAB_PAGES_VERSION=1.63.0 \
+    GITALY_SERVER_VERSION=15.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0b1ebf6f3..cf892570f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.5.4
+# sameersbn/gitlab:15.6.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.4
+docker pull sameersbn/gitlab:15.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.5.4
+ sameersbn/gitlab:15.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.5.4
+    sameersbn/gitlab:15.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:sanitize
+    sameersbn/gitlab:15.6.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake db:setup
+    sameersbn/gitlab:15.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:env:info
+    sameersbn/gitlab:15.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.5.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.4
+docker pull sameersbn/gitlab:15.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index de0797d94..9f6d8f2fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.5.4
+15.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 896a31f75..ac00f8451 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 415d67139..96b159851 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d1c5751d..d7d9d8254 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6dfd95ef0..76145fe9e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.5.4
+docker pull sameersbn/gitlab:15.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.5.4
+sameersbn/gitlab:15.6.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e6e944f0f..dd302544a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2f0f5226a..02820c3ff 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.5.4
+    image: sameersbn/gitlab:15.6.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c8554618d..8ffcc537d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.5.4
+        image: sameersbn/gitlab:15.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8db9ed890823a14c6a5ff18bd22ffa4b59533e3a Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Wed, 23 Nov 2022 15:14:40 +0000
Subject: [PATCH 0806/1124] Upgrade Go & safe dir

---
 Changelog.md            | 1 +
 Dockerfile              | 2 +-
 assets/build/install.sh | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 06c48ca02..bc1c41cbd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitaly: upgrade to v15.6.0
 - gitlab-shell: upgrade to v14.13.0
 - gitlab-pages: upgrade to v1.63.0
+- golang: upgrade to v1.18.8
 
 **15.5.4**
 
diff --git a/Dockerfile b/Dockerfile
index 7d1fad22f..7bb14cd03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=15.6.0
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
     RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
-    GOLANG_VERSION=1.17.13 \
+    GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
     GITLAB_PAGES_VERSION=1.63.0 \
     GITALY_SERVER_VERSION=15.6.0 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index f35bc1555..0d16848d7 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -78,6 +78,7 @@ exec_as_git git config --global gc.auto 0
 exec_as_git git config --global repack.writeBitmaps true
 exec_as_git git config --global receive.advertisePushOptions true
 exec_as_git git config --global advice.detachedHead false
+exec_as_git git config --global --add safe.directory /home/git/gitlab
 
 # shallow clone gitlab-foss
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
@@ -122,6 +123,7 @@ rm -rf ${GITLAB_HOME}/repositories
 
 # build gitlab-workhorse
 echo "Build gitlab-workhorse"
+git config --global --add safe.directory /home/git/gitlab
 make -C ${GITLAB_WORKHORSE_BUILD_DIR} install
 # clean up
 rm -rf ${GITLAB_WORKHORSE_BUILD_DIR}

From 03344e7af51095648e195e1119be88604cde02e2 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Fri, 2 Dec 2022 10:07:15 +0000
Subject: [PATCH 0807/1124] Upgrade to GitLab CE 15.6.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bc1c41cbd..44bb57e80 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.6.1**
+
+- gitlab: upgrade CE to v15.6.1
+- gitaly: upgrade to v15.6.1
+
 **15.6.0**
 
 - gitlab: upgrade CE to v15.6.0
diff --git a/Dockerfile b/Dockerfile
index 7bb14cd03..7348f6eea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20221019
 
-ARG VERSION=15.6.0
+ARG VERSION=15.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
     GITLAB_PAGES_VERSION=1.63.0 \
-    GITALY_SERVER_VERSION=15.6.0 \
+    GITALY_SERVER_VERSION=15.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index cf892570f..6a2fdcfdf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.6.0
+# sameersbn/gitlab:15.6.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.0
+docker pull sameersbn/gitlab:15.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.6.0
+ sameersbn/gitlab:15.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.6.0
+    sameersbn/gitlab:15.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:sanitize
+    sameersbn/gitlab:15.6.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake db:setup
+    sameersbn/gitlab:15.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.0
+docker pull sameersbn/gitlab:15.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9f6d8f2fd..0ab55a66f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.0
+15.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ac00f8451..3fce9ed91 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 96b159851..a7b847352 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d7d9d8254..92990d364 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 76145fe9e..656e47a3a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.0
+docker pull sameersbn/gitlab:15.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.6.0
+sameersbn/gitlab:15.6.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index dd302544a..79fe3059f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 02820c3ff..d693da600 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.0
+    image: sameersbn/gitlab:15.6.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8ffcc537d..eb4ba68a8 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.6.0
+        image: sameersbn/gitlab:15.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 3e81776cb2adf779b8c75bbd8d0b31c16ae1e5df Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Tue, 6 Dec 2022 10:08:27 +0000
Subject: [PATCH 0808/1124] Upgrade to GitLab CE 15.6.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 44bb57e80..195432fe4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.6.2**
+
+- gitlab: upgrade CE to v15.6.2
+- gitaly: upgrade to v15.6.2
+
 **15.6.1**
 
 - gitlab: upgrade CE to v15.6.1
diff --git a/Dockerfile b/Dockerfile
index 7348f6eea..ace206335 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20221019
 
-ARG VERSION=15.6.1
+ARG VERSION=15.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.6 \
@@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
     GITLAB_PAGES_VERSION=1.63.0 \
-    GITALY_SERVER_VERSION=15.6.1 \
+    GITALY_SERVER_VERSION=15.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6a2fdcfdf..bd4812b24 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.6.1
+# sameersbn/gitlab:15.6.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.1
+docker pull sameersbn/gitlab:15.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.6.1
+ sameersbn/gitlab:15.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.6.1
+    sameersbn/gitlab:15.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:sanitize
+    sameersbn/gitlab:15.6.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake db:setup
+    sameersbn/gitlab:15.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.1
+docker pull sameersbn/gitlab:15.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0ab55a66f..e79fdbda3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.1
+15.6.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 3fce9ed91..1f0efe351 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a7b847352..3d7a74cd4 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 92990d364..33828d088 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 656e47a3a..592f703b0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.1
+docker pull sameersbn/gitlab:15.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.6.1
+sameersbn/gitlab:15.6.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 79fe3059f..101dcecc5 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d693da600..a33e74814 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.1
+    image: sameersbn/gitlab:15.6.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index eb4ba68a8..cd09bcdb3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.6.1
+        image: sameersbn/gitlab:15.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 364df4c81d966cebfd6858b9b85f40afae4a4ff4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 8 Dec 2022 17:13:51 +0100
Subject: [PATCH 0809/1124] Upgrade ruby to v2.7.7

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ace206335..856fe446e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20221019
 ARG VERSION=15.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.6 \
-    RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \
+    RUBY_VERSION=2.7.7 \
+    RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
     GITLAB_PAGES_VERSION=1.63.0 \

From 988cb396fb484ef4b684469916dd654965fea6d5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 10 Dec 2022 13:46:38 +0100
Subject: [PATCH 0810/1124] Upgrade ruby to v3.0.4

---
 Changelog.md | 3 +++
 Dockerfile   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 195432fe4..ee9e25d4d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+- ruby: upgrade to v2.7.7
+- ruby: upgrade to v3.0.4
+
 **15.6.2**
 
 - gitlab: upgrade CE to v15.6.2
diff --git a/Dockerfile b/Dockerfile
index 856fe446e..d326da36d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20221019
 ARG VERSION=15.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.7 \
-    RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
+    RUBY_VERSION=3.0.4 \
+    RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
     GITLAB_PAGES_VERSION=1.63.0 \

From e94bf10a4f97b41ef71c713197aca17c10251996 Mon Sep 17 00:00:00 2001
From: accetto <34798830+accetto@users.noreply.github.com>
Date: Sat, 10 Dec 2022 14:48:43 +0000
Subject: [PATCH 0811/1124] Update README.md

Correction in section Configuration/Data Store
Signed-off-by: accetto <34798830+accetto@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd4812b24..f7796e03b 100644
--- a/README.md
+++ b/README.md
@@ -215,7 +215,7 @@ GitLab is a code hosting software and as such you don't want to lose your code w
 
 - `/home/git/data`
 
-*Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.*
+*Note: that if you are using the `docker-compose` approach, you must "inspect" the volumes (```docker volume inspect```) to check the mounted path.*
 
 SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux.
 

From cf581f3eb7ba0018c80d94dbd0d6dcb05eff1cc2 Mon Sep 17 00:00:00 2001
From: antt1995 <admin@antts.xyz>
Date: Thu, 22 Dec 2022 15:58:50 +0000
Subject: [PATCH 0812/1124] Upgrade to GitLab CE 15.6.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ee9e25d4d..9d09b258b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.6.3**
+- gitlab: upgrade CE to v15.6.3
+- gitaly: upgrade to v15.6.3
+- gitlab-pages: upgrade to v15.6.3
+- ubuntu: upgrade to focal-20221130
+
 - ruby: upgrade to v2.7.7
 - ruby: upgrade to v3.0.4
 
diff --git a/Dockerfile b/Dockerfile
index d326da36d..bb8d65ea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20221019
+FROM ubuntu:focal-20221130
 
-ARG VERSION=15.6.2
+ARG VERSION=15.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.4 \
     RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
-    GITLAB_PAGES_VERSION=1.63.0 \
-    GITALY_SERVER_VERSION=15.6.2 \
+    GITLAB_PAGES_VERSION=15.6.3 \
+    GITALY_SERVER_VERSION=15.6.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f7796e03b..158b3c7f0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.6.2
+# sameersbn/gitlab:15.6.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.2
+docker pull sameersbn/gitlab:15.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.6.2
+ sameersbn/gitlab:15.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.6.2
+    sameersbn/gitlab:15.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:sanitize
+    sameersbn/gitlab:15.6.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake db:setup
+    sameersbn/gitlab:15.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.2
+docker pull sameersbn/gitlab:15.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e79fdbda3..3678b9342 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.2
+15.6.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1f0efe351..a7e52abf9 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 3d7a74cd4..4c154d2dd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 33828d088..1e3f47e60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 592f703b0..79e62c522 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.2
+docker pull sameersbn/gitlab:15.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.6.2
+sameersbn/gitlab:15.6.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 101dcecc5..edf7df18f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a33e74814..7800a0db1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.2
+    image: sameersbn/gitlab:15.6.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index cd09bcdb3..63fe5b823 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.6.2
+        image: sameersbn/gitlab:15.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From c5cced2fdd0fdff3f630808b1a58e239853d90e2 Mon Sep 17 00:00:00 2001
From: antt1995 <admin@antts.xyz>
Date: Thu, 22 Dec 2022 16:01:07 +0000
Subject: [PATCH 0813/1124] Upgrade to GitLab CE 15.7.0

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9d09b258b..ab9f6e4df 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.7.0**
+- gitlab: upgrade CE to v15.7.0
+- gitaly: upgrade to v15.7.0
+- gitlab-pages: upgrade to v15.7.0
+
 **15.6.3**
 - gitlab: upgrade CE to v15.6.3
 - gitaly: upgrade to v15.6.3
diff --git a/Dockerfile b/Dockerfile
index bb8d65ea8..6bd30f102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.6.3
+ARG VERSION=15.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.4 \
     RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.13.0 \
-    GITLAB_PAGES_VERSION=15.6.3 \
-    GITALY_SERVER_VERSION=15.6.3 \
+    GITLAB_PAGES_VERSION=15.7.0 \
+    GITALY_SERVER_VERSION=15.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 158b3c7f0..5528cdf09 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.6.3
+# sameersbn/gitlab:15.7.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.3
+docker pull sameersbn/gitlab:15.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.6.3
+ sameersbn/gitlab:15.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.6.3
+    sameersbn/gitlab:15.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:sanitize
+    sameersbn/gitlab:15.7.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake db:setup
+    sameersbn/gitlab:15.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.3
+docker pull sameersbn/gitlab:15.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3678b9342..3a3b50716 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.3
+15.7.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a7e52abf9..85985b7b6 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4c154d2dd..7bc1f2dab 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e3f47e60..f4f690348 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 79e62c522..35c81ae73 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.6.3
+docker pull sameersbn/gitlab:15.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.6.3
+sameersbn/gitlab:15.7.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index edf7df18f..c2eafa3a5 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7800a0db1..6af50a1b9 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.6.3
+    image: sameersbn/gitlab:15.7.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 63fe5b823..4f046a935 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.6.3
+        image: sameersbn/gitlab:15.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8386b46009b849e6a220bb0c5596d5c8a29a5f7a Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Thu, 22 Dec 2022 21:06:27 +0000
Subject: [PATCH 0814/1124] Upgrade Ruby & Shell

---
 Changelog.md | 3 ++-
 Dockerfile   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ab9f6e4df..ae809523d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,13 +6,14 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v15.7.0
 - gitaly: upgrade to v15.7.0
 - gitlab-pages: upgrade to v15.7.0
+- gitlab-shell: upgrade to v14.14.0
+- ruby: upgrade to v3.0.5
 
 **15.6.3**
 - gitlab: upgrade CE to v15.6.3
 - gitaly: upgrade to v15.6.3
 - gitlab-pages: upgrade to v15.6.3
 - ubuntu: upgrade to focal-20221130
-
 - ruby: upgrade to v2.7.7
 - ruby: upgrade to v3.0.4
 
diff --git a/Dockerfile b/Dockerfile
index 6bd30f102..ee83fd8df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,10 @@ FROM ubuntu:focal-20221130
 ARG VERSION=15.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.0.4 \
-    RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \
+    RUBY_VERSION=3.0.5 \
+    RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
     GOLANG_VERSION=1.18.8 \
-    GITLAB_SHELL_VERSION=14.13.0 \
+    GITLAB_SHELL_VERSION=14.14.0 \
     GITLAB_PAGES_VERSION=15.7.0 \
     GITALY_SERVER_VERSION=15.7.0 \
     GITLAB_USER="git" \

From d473f5f495267ba08dcd13f8e351bf8d94dcbad8 Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Fri, 6 Jan 2023 11:19:10 +0000
Subject: [PATCH 0815/1124] Upgrade to GitLab CE 15.7.1

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ae809523d..554245493 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.7.1**
+- gitlab: upgrade CE to v15.7.1
+- gitaly: upgrade to v15.7.1
+- gitlab-pages: upgrade to v15.7.1
+
 **15.7.0**
 - gitlab: upgrade CE to v15.7.0
 - gitaly: upgrade to v15.7.0
diff --git a/Dockerfile b/Dockerfile
index ee83fd8df..53f13cbd1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.7.0
+ARG VERSION=15.7.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.5 \
     RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.14.0 \
-    GITLAB_PAGES_VERSION=15.7.0 \
-    GITALY_SERVER_VERSION=15.7.0 \
+    GITLAB_PAGES_VERSION=15.7.1 \
+    GITALY_SERVER_VERSION=15.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5528cdf09..4504a355b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.7.0
+# sameersbn/gitlab:15.7.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.0
+docker pull sameersbn/gitlab:15.7.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.7.0
+ sameersbn/gitlab:15.7.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.7.0
+    sameersbn/gitlab:15.7.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:sanitize
+    sameersbn/gitlab:15.7.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake db:setup
+    sameersbn/gitlab:15.7.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.7.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.0
+docker pull sameersbn/gitlab:15.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3a3b50716..38256ab5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.0
+15.7.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 85985b7b6..a27704988 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7bc1f2dab..2035a70ea 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f4f690348..2d9652b74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 35c81ae73..9a3d492f0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.0
+docker pull sameersbn/gitlab:15.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.7.0
+sameersbn/gitlab:15.7.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c2eafa3a5..e347a1182 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6af50a1b9..9697b0874 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.0
+    image: sameersbn/gitlab:15.7.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4f046a935..b5df3b635 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.7.0
+        image: sameersbn/gitlab:15.7.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 30bb1b0a59dedfb62ae0865ae943b9d82a016def Mon Sep 17 00:00:00 2001
From: Antt1995 <admin@antts.xyz>
Date: Tue, 10 Jan 2023 01:18:10 +0000
Subject: [PATCH 0816/1124] Upgrade to GitLab CE 15.7.2

---
 Changelog.md                            |  5 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 554245493..6983b62cb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.7.2**
+- gitlab: upgrade CE to v15.7.2
+- gitaly: upgrade to v15.7.2
+- gitlab-pages: upgrade to v15.7.2
+
 **15.7.1**
 - gitlab: upgrade CE to v15.7.1
 - gitaly: upgrade to v15.7.1
diff --git a/Dockerfile b/Dockerfile
index 53f13cbd1..5e122b5b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.7.1
+ARG VERSION=15.7.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.5 \
     RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.14.0 \
-    GITLAB_PAGES_VERSION=15.7.1 \
-    GITALY_SERVER_VERSION=15.7.1 \
+    GITLAB_PAGES_VERSION=15.7.2 \
+    GITALY_SERVER_VERSION=15.7.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4504a355b..d2cbaf0da 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.7.1
+# sameersbn/gitlab:15.7.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.1
+docker pull sameersbn/gitlab:15.7.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.7.1
+ sameersbn/gitlab:15.7.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.7.1
+    sameersbn/gitlab:15.7.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:sanitize
+    sameersbn/gitlab:15.7.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake db:setup
+    sameersbn/gitlab:15.7.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.7.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.1
+docker pull sameersbn/gitlab:15.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 38256ab5a..c5c8d0750 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.1
+15.7.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a27704988..168aab27e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2035a70ea..5ec0a8ef5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2d9652b74..e8e08b682 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9a3d492f0..5bed0cde0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.1
+docker pull sameersbn/gitlab:15.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.7.1
+sameersbn/gitlab:15.7.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e347a1182..822be28d8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 9697b0874..fda910756 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.1
+    image: sameersbn/gitlab:15.7.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b5df3b635..624ca751c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.7.1
+        image: sameersbn/gitlab:15.7.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 744448e8d0c6ae2f6f4d40b1ebc306cf458006a9 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 14 Jan 2023 14:03:05 +0100
Subject: [PATCH 0817/1124] Upgrade to GitLab CE 15.7.3

---
 Changelog.md                            | 10 +++++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6983b62cb..be7248ceb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,17 +2,26 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.7.3**
+
+- gitlab: upgrade CE to v15.7.3
+- gitaly: upgrade to v15.7.3
+- gitlab-pages: upgrade to v15.7.3
+
 **15.7.2**
+
 - gitlab: upgrade CE to v15.7.2
 - gitaly: upgrade to v15.7.2
 - gitlab-pages: upgrade to v15.7.2
 
 **15.7.1**
+
 - gitlab: upgrade CE to v15.7.1
 - gitaly: upgrade to v15.7.1
 - gitlab-pages: upgrade to v15.7.1
 
 **15.7.0**
+
 - gitlab: upgrade CE to v15.7.0
 - gitaly: upgrade to v15.7.0
 - gitlab-pages: upgrade to v15.7.0
@@ -20,6 +29,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - ruby: upgrade to v3.0.5
 
 **15.6.3**
+
 - gitlab: upgrade CE to v15.6.3
 - gitaly: upgrade to v15.6.3
 - gitlab-pages: upgrade to v15.6.3
diff --git a/Dockerfile b/Dockerfile
index 5e122b5b3..9ba5b84fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.7.2
+ARG VERSION=15.7.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.5 \
     RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.14.0 \
-    GITLAB_PAGES_VERSION=15.7.2 \
-    GITALY_SERVER_VERSION=15.7.2 \
+    GITLAB_PAGES_VERSION=15.7.3 \
+    GITALY_SERVER_VERSION=15.7.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d2cbaf0da..6622a6607 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.7.2
+# sameersbn/gitlab:15.7.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.2
+docker pull sameersbn/gitlab:15.7.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.7.2
+ sameersbn/gitlab:15.7.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.7.2
+    sameersbn/gitlab:15.7.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:sanitize
+    sameersbn/gitlab:15.7.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake db:setup
+    sameersbn/gitlab:15.7.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.7.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.2
+docker pull sameersbn/gitlab:15.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c5c8d0750..93de1108e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.2
+15.7.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 168aab27e..2b09e6899 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 5ec0a8ef5..f07a932ab 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e8e08b682..ab79632d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5bed0cde0..8f015df51 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.2
+docker pull sameersbn/gitlab:15.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.7.2
+sameersbn/gitlab:15.7.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 822be28d8..007ea9b64 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fda910756..e3b1f92a8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.2
+    image: sameersbn/gitlab:15.7.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 624ca751c..040be9edd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.7.2
+        image: sameersbn/gitlab:15.7.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 6b3dfc4d14e6d3998d8f60f5bf7cbd4f223016dd Mon Sep 17 00:00:00 2001
From: Ruben Silva <ruben@hemmer.ch>
Date: Wed, 18 Jan 2023 09:25:23 +0100
Subject: [PATCH 0818/1124] Upgrade to GitLab CE 15.7.5

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index be7248ceb..2b73b11e5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.7.5**
+
+- gitlab: upgrade CE to v15.7.5
+- gitaly: upgrade to v15.7.5
+- gitlab-pages: upgrade to v15.7.5
+
 **15.7.3**
 
 - gitlab: upgrade CE to v15.7.3
diff --git a/Dockerfile b/Dockerfile
index 9ba5b84fa..7c68ad226 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.7.3
+ARG VERSION=15.7.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.5 \
     RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
     GOLANG_VERSION=1.18.8 \
     GITLAB_SHELL_VERSION=14.14.0 \
-    GITLAB_PAGES_VERSION=15.7.3 \
-    GITALY_SERVER_VERSION=15.7.3 \
+    GITLAB_PAGES_VERSION=15.7.5 \
+    GITALY_SERVER_VERSION=15.7.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6622a6607..e6caf86b2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.7.3
+# sameersbn/gitlab:15.7.5
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.3
+docker pull sameersbn/gitlab:15.7.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.7.3
+ sameersbn/gitlab:15.7.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.7.3
+    sameersbn/gitlab:15.7.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:sanitize
+    sameersbn/gitlab:15.7.5 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake db:setup
+    sameersbn/gitlab:15.7.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.7.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.3
+docker pull sameersbn/gitlab:15.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.5
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 93de1108e..0d79499e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.3
+15.7.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2b09e6899..0877f9655 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f07a932ab..ea5e9df98 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ab79632d1..6750df56d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8f015df51..cd225f36f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.3
+docker pull sameersbn/gitlab:15.7.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.7.3
+sameersbn/gitlab:15.7.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 007ea9b64..d551c4358 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e3b1f92a8..31e45e447 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.3
+    image: sameersbn/gitlab:15.7.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 040be9edd..84c005152 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.7.3
+        image: sameersbn/gitlab:15.7.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 096085cd6c68bb4b63323d911e483ed3d71c75aa Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 22 Jan 2023 23:45:17 +0100
Subject: [PATCH 0819/1124] Upgrade to GitLab CE 15.8.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2b73b11e5..e78183c21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.8.0**
+
+- gitlab: upgrade CE to v15.8.0
+- gitaly: upgrade to v15.8.0
+- gitlab-pages: upgrade to v15.8.0
+- gitlab-shell: upgrade to v14.15.0
+- golang: upgrade to v1.18.10
+
 **15.7.5**
 
 - gitlab: upgrade CE to v15.7.5
diff --git a/Dockerfile b/Dockerfile
index 7c68ad226..3d6d4c574 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.7.5
+ARG VERSION=15.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.5 \
     RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
-    GOLANG_VERSION=1.18.8 \
-    GITLAB_SHELL_VERSION=14.14.0 \
-    GITLAB_PAGES_VERSION=15.7.5 \
-    GITALY_SERVER_VERSION=15.7.5 \
+    GOLANG_VERSION=1.18.10 \
+    GITLAB_SHELL_VERSION=14.15.0 \
+    GITLAB_PAGES_VERSION=15.8.0 \
+    GITALY_SERVER_VERSION=15.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e6caf86b2..539f51763 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.7.5
+# sameersbn/gitlab:15.8.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.5
+docker pull sameersbn/gitlab:15.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.7.5
+ sameersbn/gitlab:15.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.7.5
+    sameersbn/gitlab:15.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:sanitize
+    sameersbn/gitlab:15.8.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake db:setup
+    sameersbn/gitlab:15.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:env:info
+    sameersbn/gitlab:15.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.7.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.5
+docker pull sameersbn/gitlab:15.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0d79499e7..acabd5c12 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.5
+15.8.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0877f9655..199a15b2b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ea5e9df98..d1c3d06a9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6750df56d..2b298a6ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cd225f36f..602786ff7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.7.5
+docker pull sameersbn/gitlab:15.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.7.5
+sameersbn/gitlab:15.8.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d551c4358..fd6ad331e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 31e45e447..f1600b53d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.7.5
+    image: sameersbn/gitlab:15.8.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 84c005152..d7a83548c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.7.5
+        image: sameersbn/gitlab:15.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 660202fcd0f26856e37a5af8306ab5b2015166f6 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
Date: Tue, 24 Jan 2023 18:42:54 +0900
Subject: [PATCH 0820/1124] Rollback Ruby to v2.7.7

sameersbn/docker-gitlab#2698

Roll back to 364df4c81d966cebfd6858b9b85f40afae4a4ff4 (v2.7.6 -> v2.7.7)
- Partially revert 8386b46009b849e6a220bb0c5596d5c8a29a5f7a (v3.0.4 -> v3.0.5)
- Revert 988cb396fb484ef4b684469916dd654965fea6d5 (v2.7.7 -> v3.0.4)

Affected releases are: v15.8.0, all v15.7.x and v15.6.x (15.6.3 or later)
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d6d4c574..b1ef6e257 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20221130
 ARG VERSION=15.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.0.5 \
-    RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \
+    RUBY_VERSION=2.7.7 \
+    RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.18.10 \
     GITLAB_SHELL_VERSION=14.15.0 \
     GITLAB_PAGES_VERSION=15.8.0 \

From 9abad29f24b469db3eec140b97cbcb1761a5fcac Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Jan 2023 19:17:54 +0100
Subject: [PATCH 0821/1124] Update Changelog.md

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index e78183c21..780e09c7e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.8.0-1**
+
+- ruby: rollback to v2.7.7
+
 **15.8.0**
 
 - gitlab: upgrade CE to v15.8.0

From 991281c9fc175736e51255092e9073c2c8399bc6 Mon Sep 17 00:00:00 2001
From: Ruben Silva <ruben@hemmer.ch>
Date: Wed, 1 Feb 2023 07:42:28 +0100
Subject: [PATCH 0822/1124] Upgrade to GitLab CE 15.8.1

---
 Changelog.md                            | 14 +++++--
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 780e09c7e..a841633dc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,15 +2,21 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.8.1**
+
+- gitlab: upgrade CE to v15.8.1
+- gitaly: upgrade to v15.8.1
+- gitlab-pages: upgrade to v15.8.1
+
 **15.8.0-1**
 
 - ruby: rollback to v2.7.7
 
-**15.8.0**
+**15.8.1**
 
-- gitlab: upgrade CE to v15.8.0
-- gitaly: upgrade to v15.8.0
-- gitlab-pages: upgrade to v15.8.0
+- gitlab: upgrade CE to v15.8.1
+- gitaly: upgrade to v15.8.1
+- gitlab-pages: upgrade to v15.8.1
 - gitlab-shell: upgrade to v14.15.0
 - golang: upgrade to v1.18.10
 
diff --git a/Dockerfile b/Dockerfile
index b1ef6e257..203ea57e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20221130
 
-ARG VERSION=15.8.0
+ARG VERSION=15.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.18.10 \
     GITLAB_SHELL_VERSION=14.15.0 \
-    GITLAB_PAGES_VERSION=15.8.0 \
-    GITALY_SERVER_VERSION=15.8.0 \
+    GITLAB_PAGES_VERSION=15.8.1 \
+    GITALY_SERVER_VERSION=15.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 539f51763..1e43c95b5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.8.0
+# sameersbn/gitlab:15.8.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.0
+docker pull sameersbn/gitlab:15.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.8.0
+ sameersbn/gitlab:15.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.8.0
+    sameersbn/gitlab:15.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:sanitize
+    sameersbn/gitlab:15.8.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake db:setup
+    sameersbn/gitlab:15.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.0
+docker pull sameersbn/gitlab:15.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index acabd5c12..873bea49d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.8.0
+15.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 199a15b2b..ef92e8601 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d1c3d06a9..05f2c2ffc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b298a6ba..2114aa40f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 602786ff7..0d53ada32 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.0
+docker pull sameersbn/gitlab:15.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.8.0
+sameersbn/gitlab:15.8.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fd6ad331e..7a18c8f12 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f1600b53d..c26fb276e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.0
+    image: sameersbn/gitlab:15.8.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d7a83548c..b24bdd048 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.8.0
+        image: sameersbn/gitlab:15.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From d84cf4ad47917e4d40b9086bced24ee806bbf5ab Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 1 Feb 2023 15:43:13 +0100
Subject: [PATCH 0823/1124] Update Changelog.md

---
 Changelog.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a841633dc..3ec8a1c9f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,11 +12,11 @@ This file only reflects the changes that are made in this image. Please refer to
 
 - ruby: rollback to v2.7.7
 
-**15.8.1**
+**15.8.0**
 
-- gitlab: upgrade CE to v15.8.1
-- gitaly: upgrade to v15.8.1
-- gitlab-pages: upgrade to v15.8.1
+- gitlab: upgrade CE to v15.8.0
+- gitaly: upgrade to v15.8.0
+- gitlab-pages: upgrade to v15.8.0
 - gitlab-shell: upgrade to v14.15.0
 - golang: upgrade to v1.18.10
 

From 6e7c15466a229f79d3f4e94fa0ba3ba181ca49e0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 1 Feb 2023 15:44:23 +0100
Subject: [PATCH 0824/1124] Use newer docker baseimage

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

diff --git a/Dockerfile b/Dockerfile
index 203ea57e4..cbecb80f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20221130
+FROM ubuntu:focal-20230126
 
 ARG VERSION=15.8.1
 

From ab73d1c2b8a9b3dccf1e95172b2139ff9b078d4d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 1 Feb 2023 15:46:57 +0100
Subject: [PATCH 0825/1124] Update Changelog.md

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 3ec8a1c9f..f69e6383c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v15.8.1
 - gitaly: upgrade to v15.8.1
 - gitlab-pages: upgrade to v15.8.1
+- ubuntu: upgrade to focal-20230126
 
 **15.8.0-1**
 

From 9b6ec634c900c7972c64f41648a2629f6b90da00 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 17 Feb 2023 07:41:37 +0100
Subject: [PATCH 0826/1124] Upgrade to GitLab CE 15.8.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f69e6383c..2761d15f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.8.2**
+
+- gitlab: upgrade CE to v15.8.1
+- gitaly: upgrade to v15.8.1
+- golang: upgrade to v1.19.6
+
 **15.8.1**
 
 - gitlab: upgrade CE to v15.8.1
diff --git a/Dockerfile b/Dockerfile
index cbecb80f5..406d4ac49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230126
 
-ARG VERSION=15.8.1
+ARG VERSION=15.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
-    GOLANG_VERSION=1.18.10 \
+    GOLANG_VERSION=1.19.6 \
     GITLAB_SHELL_VERSION=14.15.0 \
-    GITLAB_PAGES_VERSION=15.8.1 \
-    GITALY_SERVER_VERSION=15.8.1 \
+    GITLAB_PAGES_VERSION=15.8.2 \
+    GITALY_SERVER_VERSION=15.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1e43c95b5..66a477933 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.8.1
+# sameersbn/gitlab:15.8.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.1
+docker pull sameersbn/gitlab:15.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.8.1
+ sameersbn/gitlab:15.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.8.1
+    sameersbn/gitlab:15.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:sanitize
+    sameersbn/gitlab:15.8.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake db:setup
+    sameersbn/gitlab:15.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.1
+docker pull sameersbn/gitlab:15.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 873bea49d..6ea50a00f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.8.1
+15.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ef92e8601..b64f75e46 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 05f2c2ffc..2318f2371 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2114aa40f..9e72febae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0d53ada32..cdb4ce138 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.1
+docker pull sameersbn/gitlab:15.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.8.1
+sameersbn/gitlab:15.8.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7a18c8f12..516027ec6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c26fb276e..95245c730 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.1
+    image: sameersbn/gitlab:15.8.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b24bdd048..b7ef3624d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.8.1
+        image: sameersbn/gitlab:15.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From c8f2ed3ded34ec4f86a25b84a6ddde794239588d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 17 Feb 2023 07:54:17 +0100
Subject: [PATCH 0827/1124] Fix Changelog

---
 Changelog.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2761d15f5..50fee12d0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,8 +4,9 @@ This file only reflects the changes that are made in this image. Please refer to
 
 **15.8.2**
 
-- gitlab: upgrade CE to v15.8.1
-- gitaly: upgrade to v15.8.1
+- gitlab: upgrade CE to v15.8.2
+- gitaly: upgrade to v15.8.2
+- gitlab-pages: upgrade to v15.8.2
 - golang: upgrade to v1.19.6
 
 **15.8.1**

From 255ec9461a61d8fbe92e79112abf75e539a69539 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 22 Feb 2023 03:58:27 +0900
Subject: [PATCH 0828/1124] Increase default SIDEKIQ_MEMORY_KILLER_MAX_RSS to
 2GB

There are many warnings like below
recorded in {GITLAB_LOG_DIR}/supervisord/sidekiq.log.
This can be avoided by simply increasing SIDEKIQ_MEMORY_KILLER_MAX_RSS.

----
{
  "severity": "WARN",
  "time": "[MASKED]",
  "class": "Gitlab::SidekiqDaemon::MemoryKiller",
  "pid": [MASKED],
  "message": "Sidekiq worker RSS out of range",
  "current_rss": 1009636,
  "soft_limit_rss": 1000000,
  "hard_limit_rss": [MASKED],
  "memory_total_kb": [MASKED],
  "reason": "current_rss(1009636) \u003e soft_limit_rss(1000000)",
  "running_jobs": [],
  "retry": 0
}
----

For sameersbn/gitlab, this parameter have been introduced with
following commit on May 21, 2015 and never updated until today:
e4008cc7ab9efd626511af4c43e52e2a9490d612

On upstream, the default setting documentation is updated here:
  https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31682
but it is said "the documentation is outdated" at this time.
I could not find out when the value is increased.

At least, In omnibus-gitlab, this have been introduced in MR 2360
(release 11.10.0+ce.0 / 11.10.0+ee.0)
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/2360
---
 README.md                   | 2 +-
 assets/runtime/env-defaults | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 66a477933..693ef7742 100644
--- a/README.md
+++ b/README.md
@@ -1746,7 +1746,7 @@ Timeout for sidekiq shutdown. Defaults to `4`
 
 ##### `SIDEKIQ_MEMORY_KILLER_MAX_RSS`
 
-Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
+Non-zero value enables the SidekiqMemoryKiller. Defaults to `2000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html)
 
 ##### `GITLAB_SIDEKIQ_LOG_FORMAT`
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 46624eafc..deab8a2a8 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -62,7 +62,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0}
 ## SIDEKIQ
 SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4}
 SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
-SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
+SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-2000000}
 GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 
 ## PUMA

From af9e984fd6156f314070a44dbf968894a79b1a6b Mon Sep 17 00:00:00 2001
From: Sam Mosleh <sam.mosleh@ut.ac.ir>
Date: Wed, 22 Feb 2023 14:29:55 +0300
Subject: [PATCH 0829/1124] Mount /tmp/builds from host to runners

---
 docs/docker-swarm-traefik-registry.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md
index cf6f479dc..671bd7f55 100644
--- a/docs/docker-swarm-traefik-registry.md
+++ b/docs/docker-swarm-traefik-registry.md
@@ -331,6 +331,7 @@ docker run -d \
     --name gitlab-runner \
     --restart always \
     -v gitlab-runner:/etc/gitlab-runner \
+    -v /tmp/builds:/tmp/builds \
     -v /var/run/docker.sock:/var/run/docker.sock \
     gitlab/gitlab-runner:latest
 ```
@@ -363,7 +364,11 @@ gitlab-runner \
     register -n \
     --name "Docker Runner" \
     --executor docker \
+    --locked false \
+    --access-level not_protected \
+    --builds-dir /tmp/builds \
     --docker-image docker:latest \
+    --docker-volumes /tmp/builds:/tmp/builds
     --docker-volumes /var/run/docker.sock:/var/run/docker.sock \
     --url $GITLAB_URL \
     --registration-token $GITLAB_TOKEN \

From 10a48c1541489e4248253aa1513056f82ddcb9e6 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 22 Feb 2023 04:55:17 +0900
Subject: [PATCH 0830/1124] Clarify user=root in supervisord.conf

to prevent "Supervisor running as root" warning
---
 assets/build/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 0d16848d7..46537070c 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -251,6 +251,10 @@ echo "UseDNS no" >> /etc/ssh/sshd_config
 # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/
 sed -i "s|^[#]*logfile=.*|logfile=${GITLAB_LOG_DIR}/supervisor/supervisord.log ;|" /etc/supervisor/supervisord.conf
 
+# prevent confusing warning "CRIT Supervisor running as root" by clarify run as root
+#   user not defined in supervisord.conf by default, so just append it after [supervisord] block
+sed -i "/\[supervisord\]/a user=root" /etc/supervisor/supervisord.conf
+
 # move nginx logs to ${GITLAB_LOG_DIR}/nginx
 sed -i \
   -e "s|access_log /var/log/nginx/access.log;|access_log ${GITLAB_LOG_DIR}/nginx/access.log;|" \

From a1dcfe6eaf6436e9ff668e39dcf49a4d5efe1c92 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 22 Feb 2023 04:24:00 +0900
Subject: [PATCH 0831/1124] Update sidekiq supervisord config; sidekiq v6.0

Sidekiq is updated to v6.0 here (first contained tag: v14.4.0-ee)
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69655

In Sidekiq 6.0, these options have been marked as "deprecated":
-P (set pid file)
-L (set log file)
See https://github.com/sidekiq/sidekiq/commit/3f5b1c5

Now, we can see error message in {GITLAB_LOGS_DIR}/supervisor/sidekiq.log
like below:

----
ERROR: PID file creation was removed in Sidekiq 6.0, please use a proper process supervisor to start and manage your services
ERROR: Logfile redirection was removed in Sidekiq 6.0, Sidekiq will only log to STDOUT
----

Just stop using this option.
---
 assets/build/install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 46537070c..774aaa6af 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -353,8 +353,6 @@ command=bundle exec sidekiq -c {{SIDEKIQ_CONCURRENCY}}
   -C ${GITLAB_INSTALL_DIR}/config/sidekiq_queues.yml
   -e ${RAILS_ENV}
   -t {{SIDEKIQ_SHUTDOWN_TIMEOUT}}
-  -P ${GITLAB_INSTALL_DIR}/tmp/pids/sidekiq.pid
-  -L ${GITLAB_INSTALL_DIR}/log/sidekiq.log
 user=git
 autostart=true
 autorestart=true

From 1ddbbffa87a016b0547dc4f7d16c8a9ea494d1f6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Feb 2023 09:04:25 +0100
Subject: [PATCH 0832/1124] Upgrade to GitLab CE 15.9.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 50fee12d0..09e615236 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.9.0**
+
+- gitlab: upgrade CE to v15.9.0
+- gitaly: upgrade to v15.9.0
+- gitlab-pages: upgrade to v15.9.0
+- gitlab-shell: upgrade to v14.17.0
+
 **15.8.2**
 
 - gitlab: upgrade CE to v15.8.2
diff --git a/Dockerfile b/Dockerfile
index 406d4ac49..b9c3305a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230126
 
-ARG VERSION=15.8.2
+ARG VERSION=15.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.19.6 \
-    GITLAB_SHELL_VERSION=14.15.0 \
-    GITLAB_PAGES_VERSION=15.8.2 \
-    GITALY_SERVER_VERSION=15.8.2 \
+    GITLAB_SHELL_VERSION=14.17.0 \
+    GITLAB_PAGES_VERSION=15.9.0 \
+    GITALY_SERVER_VERSION=15.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 66a477933..a5320278f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.8.2
+# sameersbn/gitlab:15.9.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.2
+docker pull sameersbn/gitlab:15.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.8.2
+ sameersbn/gitlab:15.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.8.2
+    sameersbn/gitlab:15.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:sanitize
+    sameersbn/gitlab:15.9.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake db:setup
+    sameersbn/gitlab:15.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.2
+docker pull sameersbn/gitlab:15.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6ea50a00f..26268b586 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.8.2
+15.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b64f75e46..93f302030 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2318f2371..87efa247a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e72febae..10e7d8d2b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cdb4ce138..94951a0cd 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.8.2
+docker pull sameersbn/gitlab:15.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.8.2
+sameersbn/gitlab:15.9.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 516027ec6..96b2f08fd 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 95245c730..2881be5b7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.8.2
+    image: sameersbn/gitlab:15.9.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b7ef3624d..1bd59c7ee 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.8.2
+        image: sameersbn/gitlab:15.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 7e2632746ada6fa812612aa32664643f0a1db081 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 25 Feb 2023 09:51:09 +0100
Subject: [PATCH 0833/1124] Upgrade to GitLab CE 15.9.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 09e615236..cf730b364 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.9.1**
+
+- gitlab: upgrade CE to v15.9.1
+- gitaly: upgrade to v15.9.1
+- gitlab-pages: upgrade to v15.9.1
+
 **15.9.0**
 
 - gitlab: upgrade CE to v15.9.0
diff --git a/Dockerfile b/Dockerfile
index b9c3305a7..97ababe1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230126
 
-ARG VERSION=15.9.0
+ARG VERSION=15.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.19.6 \
     GITLAB_SHELL_VERSION=14.17.0 \
-    GITLAB_PAGES_VERSION=15.9.0 \
-    GITALY_SERVER_VERSION=15.9.0 \
+    GITLAB_PAGES_VERSION=15.9.1 \
+    GITALY_SERVER_VERSION=15.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a5320278f..1adaefc58 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.9.0
+# sameersbn/gitlab:15.9.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.0
+docker pull sameersbn/gitlab:15.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.9.0
+ sameersbn/gitlab:15.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.9.0
+    sameersbn/gitlab:15.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:sanitize
+    sameersbn/gitlab:15.9.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake db:setup
+    sameersbn/gitlab:15.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.0
+docker pull sameersbn/gitlab:15.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 26268b586..0609f86d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.0
+15.9.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 93f302030..5c760a675 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 87efa247a..ee165a3e5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 10e7d8d2b..36515fe5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 94951a0cd..262702fd6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.0
+docker pull sameersbn/gitlab:15.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.9.0
+sameersbn/gitlab:15.9.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 96b2f08fd..6b2b94336 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2881be5b7..fb0b3c485 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.0
+    image: sameersbn/gitlab:15.9.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1bd59c7ee..5aef04329 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.9.0
+        image: sameersbn/gitlab:15.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From bb1af3a06755b4176efced559e02c0a3c71733ad Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 6 Mar 2023 20:14:30 +0100
Subject: [PATCH 0834/1124] Upgrade to GitLab CE 15.9.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cf730b364..9f8680deb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.9.2**
+
+- gitlab: upgrade CE to v15.9.2
+- gitaly: upgrade to v15.9.2
+- gitlab-pages: upgrade to v15.9.2
+- ubuntu: upgrade to focal-20230301
+
 **15.9.1**
 
 - gitlab: upgrade CE to v15.9.1
diff --git a/Dockerfile b/Dockerfile
index 97ababe1a..119b8ab02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230126
+FROM ubuntu:focal-20230301
 
-ARG VERSION=15.9.1
+ARG VERSION=15.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.19.6 \
     GITLAB_SHELL_VERSION=14.17.0 \
-    GITLAB_PAGES_VERSION=15.9.1 \
-    GITALY_SERVER_VERSION=15.9.1 \
+    GITLAB_PAGES_VERSION=15.9.2 \
+    GITALY_SERVER_VERSION=15.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1adaefc58..5f4974af6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.9.1
+# sameersbn/gitlab:15.9.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.1
+docker pull sameersbn/gitlab:15.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.9.1
+ sameersbn/gitlab:15.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.9.1
+    sameersbn/gitlab:15.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:sanitize
+    sameersbn/gitlab:15.9.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake db:setup
+    sameersbn/gitlab:15.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.1
+docker pull sameersbn/gitlab:15.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0609f86d5..3390913b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.1
+15.9.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5c760a675..47aa2b4d4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ee165a3e5..c4b63fe91 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 36515fe5a..e206668c4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 262702fd6..233283d3e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.1
+docker pull sameersbn/gitlab:15.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.9.1
+sameersbn/gitlab:15.9.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6b2b94336..ea4def88d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fb0b3c485..eb8bd7be5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.1
+    image: sameersbn/gitlab:15.9.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5aef04329..30e8407b3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.9.1
+        image: sameersbn/gitlab:15.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 7b37de25687424b18ae0a402a631d8949e7146a5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 13 Mar 2023 00:23:15 +0100
Subject: [PATCH 0835/1124] Upgrade GitLab CE to 15.9.3

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9f8680deb..a4f3e61e5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.9.3**
+
+- gitlab: upgrade CE to v15.9.3
+- gitaly: upgrade to v15.9.3
+- gitlab-pages: upgrade to v15.9.3
+- golang: upgrade to v1.20.2
+
 **15.9.2**
 
 - gitlab: upgrade CE to v15.9.2
diff --git a/Dockerfile b/Dockerfile
index 119b8ab02..c2164122d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230301
 
-ARG VERSION=15.9.2
+ARG VERSION=15.9.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
-    GOLANG_VERSION=1.19.6 \
+    GOLANG_VERSION=1.20.2 \
     GITLAB_SHELL_VERSION=14.17.0 \
-    GITLAB_PAGES_VERSION=15.9.2 \
-    GITALY_SERVER_VERSION=15.9.2 \
+    GITLAB_PAGES_VERSION=15.9.3 \
+    GITALY_SERVER_VERSION=15.9.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 62ab70c7a..068950b77 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.9.2
+# sameersbn/gitlab:15.9.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.2
+docker pull sameersbn/gitlab:15.9.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.9.2
+ sameersbn/gitlab:15.9.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.9.2
+    sameersbn/gitlab:15.9.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:sanitize
+    sameersbn/gitlab:15.9.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake db:setup
+    sameersbn/gitlab:15.9.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.9.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.2
+docker pull sameersbn/gitlab:15.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3390913b7..9a3465a25 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.2
+15.9.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 47aa2b4d4..998e8a3c1 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c4b63fe91..871d314bb 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e206668c4..70d6da8b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 233283d3e..153a7f9de 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.2
+docker pull sameersbn/gitlab:15.9.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.9.2
+sameersbn/gitlab:15.9.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ea4def88d..23f443f5e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index eb8bd7be5..89a8e8805 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.2
+    image: sameersbn/gitlab:15.9.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 30e8407b3..10fc0aff7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.9.2
+        image: sameersbn/gitlab:15.9.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 268af6625968b8e1747585b0b54ba4f9c3f6ae2f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 23 Mar 2023 20:24:45 +0100
Subject: [PATCH 0836/1124] Upgrade GitLab CE to 15.10.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a4f3e61e5..5272b9550 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.10.0**
+
+- gitlab: upgrade CE to v15.10.0
+- gitaly: upgrade to v15.10.0
+- gitlab-pages: upgrade to v15.10.0
+- gitlab-shell: upgrade to v14.18.0
+- ubuntu: upgrade to focal-20230308
+
 **15.9.3**
 
 - gitlab: upgrade CE to v15.9.3
diff --git a/Dockerfile b/Dockerfile
index c2164122d..e66ff840d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230301
+FROM ubuntu:focal-20230308
 
-ARG VERSION=15.9.3
+ARG VERSION=15.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.7 \
     RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
     GOLANG_VERSION=1.20.2 \
-    GITLAB_SHELL_VERSION=14.17.0 \
-    GITLAB_PAGES_VERSION=15.9.3 \
-    GITALY_SERVER_VERSION=15.9.3 \
+    GITLAB_SHELL_VERSION=14.18.0 \
+    GITLAB_PAGES_VERSION=15.10.0 \
+    GITALY_SERVER_VERSION=15.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 068950b77..af3cd633d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.9.3
+# sameersbn/gitlab:15.10.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.3
+docker pull sameersbn/gitlab:15.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.9.3
+ sameersbn/gitlab:15.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.9.3
+    sameersbn/gitlab:15.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:sanitize
+    sameersbn/gitlab:15.10.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake db:setup
+    sameersbn/gitlab:15.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.3
+docker pull sameersbn/gitlab:15.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9a3465a25..9f7cbe79b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.3
+15.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 998e8a3c1..b6e942521 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 871d314bb..d601c412c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 70d6da8b0..dfc25cab9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 153a7f9de..fd97e7e45 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.9.3
+docker pull sameersbn/gitlab:15.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.9.3
+sameersbn/gitlab:15.10.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 23f443f5e..55d30f369 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 89a8e8805..d293cb2be 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.9.3
+    image: sameersbn/gitlab:15.10.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 10fc0aff7..f2f5ec48b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.9.3
+        image: sameersbn/gitlab:15.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 4bfc8974ba0f3fe9cb3614e6e57c828e6e85c793 Mon Sep 17 00:00:00 2001
From: Markus Zimmermann <markus.zimmermann@symflower.com>
Date: Fri, 24 Mar 2023 11:55:42 +0100
Subject: [PATCH 0837/1124] Allow SSH clients to explicitly set the Git
 transfer protocol

This allows to the client to explicitly select protocol version 2, which is much more efficient. Without allowing that environment variable it seems that SSH connections are always stuck in version1.  See https://docs.gitlab.com/ee/administration/git_protocol.html on how to check if protocol 2 is used.
---
 assets/build/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 774aaa6af..ffeb4d083 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -246,6 +246,7 @@ sed -i \
   -e "s|^[#]*LogLevel INFO|LogLevel VERBOSE|" \
   -e "s|^[#]*AuthorizedKeysFile.*|AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_proxy|" \
   /etc/ssh/sshd_config
+echo "AcceptEnv GIT_PROTOCOL" >> /etc/ssh/sshd_config # Allow clients to explicitly set the Git transfer protocol, e.g. to enable version 2.
 echo "UseDNS no" >> /etc/ssh/sshd_config
 
 # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/

From 7a49de8775b0eaff31b61db2fde5206ce45501f9 Mon Sep 17 00:00:00 2001
From: sam-mosleh <41725025+sam-mosleh@users.noreply.github.com>
Date: Wed, 29 Mar 2023 03:17:21 +0330
Subject: [PATCH 0838/1124] Add missing trailing backslash

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 docs/docker-swarm-traefik-registry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md
index 671bd7f55..7f941efba 100644
--- a/docs/docker-swarm-traefik-registry.md
+++ b/docs/docker-swarm-traefik-registry.md
@@ -368,7 +368,7 @@ gitlab-runner \
     --access-level not_protected \
     --builds-dir /tmp/builds \
     --docker-image docker:latest \
-    --docker-volumes /tmp/builds:/tmp/builds
+    --docker-volumes /tmp/builds:/tmp/builds \
     --docker-volumes /var/run/docker.sock:/var/run/docker.sock \
     --url $GITLAB_URL \
     --registration-token $GITLAB_TOKEN \

From 95bc778ee0cb4159bf18303e683cd4a14ad0e440 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 31 Mar 2023 03:00:49 +0900
Subject: [PATCH 0839/1124] Silence "CRIT unixServer" warning from supervisord

Silence the message like below:
  CRIT Server 'unix_http_server' running without any HTTP authentication checking

Reference:
  https://github.com/Supervisor/supervisor/issues/717#issuecomment-176860145
  https://github.com/sameersbn/docker-redmine/commit/0fb84b9
---
 assets/build/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 774aaa6af..0331e1f43 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -251,6 +251,10 @@ echo "UseDNS no" >> /etc/ssh/sshd_config
 # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/
 sed -i "s|^[#]*logfile=.*|logfile=${GITLAB_LOG_DIR}/supervisor/supervisord.log ;|" /etc/supervisor/supervisord.conf
 
+# silence "CRIT Server 'unix_http_server' running without any HTTP authentication checking" message
+# https://github.com/Supervisor/supervisor/issues/717
+sed -i '/\.sock/a password=dummy' /etc/supervisor/supervisord.conf
+sed -i '/\.sock/a username=dummy' /etc/supervisor/supervisord.conf
 # prevent confusing warning "CRIT Supervisor running as root" by clarify run as root
 #   user not defined in supervisord.conf by default, so just append it after [supervisord] block
 sed -i "/\[supervisord\]/a user=root" /etc/supervisor/supervisord.conf

From a5582d96f598cc3adba24fa124f8c5a9354aec3a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 31 Mar 2023 10:36:45 +0200
Subject: [PATCH 0840/1124] Upgrade GitLab CE to 15.10.1

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5272b9550..c69a98013 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.10.1**
+
+- gitlab: upgrade CE to v15.10.1
+- gitaly: upgrade to v15.10.1
+- gitlab-pages: upgrade to v15.10.1
+- ruby: upgrade to v2.7.8
+- ubuntu: upgrade to focal-20230308
+
 **15.10.0**
 
 - gitlab: upgrade CE to v15.10.0
diff --git a/Dockerfile b/Dockerfile
index e66ff840d..568352fda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230308
 
-ARG VERSION=15.10.0
+ARG VERSION=15.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.7 \
-    RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \
+    RUBY_VERSION=2.7.8 \
+    RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
     GOLANG_VERSION=1.20.2 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.10.0 \
-    GITALY_SERVER_VERSION=15.10.0 \
+    GITLAB_PAGES_VERSION=15.10.1 \
+    GITALY_SERVER_VERSION=15.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index af3cd633d..e0febc05e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.10.0
+# sameersbn/gitlab:15.10.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.0
+docker pull sameersbn/gitlab:15.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.10.0
+ sameersbn/gitlab:15.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.10.0
+    sameersbn/gitlab:15.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:sanitize
+    sameersbn/gitlab:15.10.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake db:setup
+    sameersbn/gitlab:15.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.0
+docker pull sameersbn/gitlab:15.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9f7cbe79b..08aeefc4d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.0
+15.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b6e942521..2f9cad957 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d601c412c..f79372068 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dfc25cab9..433a41f53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fd97e7e45..9fc30f59c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.0
+docker pull sameersbn/gitlab:15.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.10.0
+sameersbn/gitlab:15.10.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 55d30f369..27d154ee9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d293cb2be..ace019a12 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.0
+    image: sameersbn/gitlab:15.10.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f2f5ec48b..7db6ed141 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.10.0
+        image: sameersbn/gitlab:15.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 41c5afe8041e195691824128a8fd542311b6ed8e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 7 Apr 2023 08:45:55 +0200
Subject: [PATCH 0841/1124] Upgrade GitLab CE to 15.10.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c69a98013..a0c32d0ec 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.10.2**
+
+- gitlab: upgrade CE to v15.10.2
+- gitaly: upgrade to v15.10.2
+- gitlab-pages: upgrade to v15.10.2
+- golang: upgrade to v1.20.3
+
 **15.10.1**
 
 - gitlab: upgrade CE to v15.10.1
diff --git a/Dockerfile b/Dockerfile
index 568352fda..f378fa33e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230308
 
-ARG VERSION=15.10.1
+ARG VERSION=15.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.8 \
     RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
-    GOLANG_VERSION=1.20.2 \
+    GOLANG_VERSION=1.20.3 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.10.1 \
-    GITALY_SERVER_VERSION=15.10.1 \
+    GITLAB_PAGES_VERSION=15.10.2 \
+    GITALY_SERVER_VERSION=15.10.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e0febc05e..ff1111587 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.10.1
+# sameersbn/gitlab:15.10.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.1
+docker pull sameersbn/gitlab:15.10.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.10.1
+ sameersbn/gitlab:15.10.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.10.1
+    sameersbn/gitlab:15.10.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:sanitize
+    sameersbn/gitlab:15.10.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake db:setup
+    sameersbn/gitlab:15.10.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.10.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.1
+docker pull sameersbn/gitlab:15.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 08aeefc4d..93d70a7d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.1
+15.10.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2f9cad957..6db02335d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f79372068..1e7c31e48 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 433a41f53..b62b07e53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9fc30f59c..8fb615f56 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.1
+docker pull sameersbn/gitlab:15.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.10.1
+sameersbn/gitlab:15.10.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 27d154ee9..b136c5bd4 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ace019a12..c80b612d6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.1
+    image: sameersbn/gitlab:15.10.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7db6ed141..2eac4ef0d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.10.1
+        image: sameersbn/gitlab:15.10.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 286b938f932dc50b22254060d24d7766a7731b77 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 16 Apr 2023 20:21:24 +0200
Subject: [PATCH 0842/1124] Upgrade GitLab CE to 15.10.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a0c32d0ec..08d96d6ae 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.10.3**
+
+- gitlab: upgrade CE to v15.10.3
+- gitaly: upgrade to v15.10.3
+- gitlab-pages: upgrade to v15.10.3
+
 **15.10.2**
 
 - gitlab: upgrade CE to v15.10.2
diff --git a/Dockerfile b/Dockerfile
index f378fa33e..9c10e969f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230308
 
-ARG VERSION=15.10.2
+ARG VERSION=15.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.8 \
     RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
     GOLANG_VERSION=1.20.3 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.10.2 \
-    GITALY_SERVER_VERSION=15.10.2 \
+    GITLAB_PAGES_VERSION=15.10.3 \
+    GITALY_SERVER_VERSION=15.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ff1111587..f9bc05f25 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.10.2
+# sameersbn/gitlab:15.10.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.2
+docker pull sameersbn/gitlab:15.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.10.2
+ sameersbn/gitlab:15.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.10.2
+    sameersbn/gitlab:15.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:sanitize
+    sameersbn/gitlab:15.10.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake db:setup
+    sameersbn/gitlab:15.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.2
+docker pull sameersbn/gitlab:15.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 93d70a7d0..0eb5841aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.2
+15.10.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6db02335d..e18e3e3d2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1e7c31e48..f3e85d9cb 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b62b07e53..46ad2f893 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8fb615f56..e5222c8ab 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.2
+docker pull sameersbn/gitlab:15.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.10.2
+sameersbn/gitlab:15.10.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b136c5bd4..5e85da829 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c80b612d6..ac3b5d06a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.2
+    image: sameersbn/gitlab:15.10.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2eac4ef0d..93d27c430 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.10.2
+        image: sameersbn/gitlab:15.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 029186dc631d39aebed9fe7e1f5672212c79174b Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 8 Jul 2022 09:34:37 +0900
Subject: [PATCH 0843/1124] Avoid permission error on creating config file

`assets/build/config/database.yml.postgresql` is owned by root:root,
and permission is rwxrw----
so the user `git` (`${GILTAB_USER}`) doesn't have a permission to copy the file.
This raises an error while building.
---
 assets/build/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 92d3343ea..b84cbe902 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -193,7 +193,8 @@ exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_
 # Temporary workaround, see <https://github.com/sameersbn/docker-gitlab/pull/2596>
 #
 # exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
-exec_as_git cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 
 # Installs nodejs packages required to compile webpack
 exec_as_git yarn install --production --pure-lockfile

From c39cb4d600869f65d483014eaeee3014f35bf843 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 22 Apr 2023 22:32:22 +0200
Subject: [PATCH 0844/1124] Upgrade GitLab CE to 15.11.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 08d96d6ae..1749a6f52 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.0**
+
+- gitlab: upgrade CE to v15.11.0
+- gitaly: upgrade to v15.11.0
+- gitlab-pages: upgrade to v15.11.0
+- ubuntu: upgrade to focal-20230412
+
 **15.10.3**
 
 - gitlab: upgrade CE to v15.10.3
diff --git a/Dockerfile b/Dockerfile
index 9c10e969f..3a160cc52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230308
+FROM ubuntu:focal-20230412
 
-ARG VERSION=15.10.3
+ARG VERSION=15.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.8 \
     RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
     GOLANG_VERSION=1.20.3 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.10.3 \
-    GITALY_SERVER_VERSION=15.10.3 \
+    GITLAB_PAGES_VERSION=15.11.0 \
+    GITALY_SERVER_VERSION=15.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f9bc05f25..eda0c1e4e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.10.3
+# sameersbn/gitlab:15.11.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.3
+docker pull sameersbn/gitlab:15.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.10.3
+ sameersbn/gitlab:15.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.10.3
+    sameersbn/gitlab:15.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:sanitize
+    sameersbn/gitlab:15.11.0 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake db:setup
+    sameersbn/gitlab:15.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.3
+docker pull sameersbn/gitlab:15.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.0
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0eb5841aa..33db3f0ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.10.3
+15.11.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e18e3e3d2..b43f40486 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f3e85d9cb..77cf997a5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 46ad2f893..536b0f818 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e5222c8ab..003aba0b5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.10.3
+docker pull sameersbn/gitlab:15.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.10.3
+sameersbn/gitlab:15.11.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5e85da829..cbe5fd66d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ac3b5d06a..3505dd11b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.10.3
+    image: sameersbn/gitlab:15.11.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 93d27c430..458015b12 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.10.3
+        image: sameersbn/gitlab:15.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d9e936ae1edc89106c05bb586cdedd6218b91be8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 4 May 2023 05:41:38 +0200
Subject: [PATCH 0845/1124] Upgrade GitLab CE to 15.11.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1749a6f52..7936f5288 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.1**
+
+- gitlab: upgrade CE to v15.11.1
+- gitaly: upgrade to v15.11.1
+- gitlab-pages: upgrade to v15.11.1
+- golang: upgrade to v1.20.4
+
 **15.11.0**
 
 - gitlab: upgrade CE to v15.11.0
diff --git a/Dockerfile b/Dockerfile
index 3a160cc52..ba0388633 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.0
+ARG VERSION=15.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.8 \
     RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
-    GOLANG_VERSION=1.20.3 \
+    GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.0 \
-    GITALY_SERVER_VERSION=15.11.0 \
+    GITLAB_PAGES_VERSION=15.11.1 \
+    GITALY_SERVER_VERSION=15.11.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index eda0c1e4e..6d3de9cf1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.0
+# sameersbn/gitlab:15.11.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.0
+docker pull sameersbn/gitlab:15.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.0
+ sameersbn/gitlab:15.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.0
+    sameersbn/gitlab:15.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:sanitize
+    sameersbn/gitlab:15.11.1 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake db:setup
+    sameersbn/gitlab:15.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.0
+docker pull sameersbn/gitlab:15.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.1
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 33db3f0ea..558cc008c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.0
+15.11.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b43f40486..2e32b35be 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 77cf997a5..2c617397c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 536b0f818..a4b7bc5e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 003aba0b5..03afaf677 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.0
+docker pull sameersbn/gitlab:15.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.0
+sameersbn/gitlab:15.11.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cbe5fd66d..4789f3d78 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 3505dd11b..80ba3dab7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.0
+    image: sameersbn/gitlab:15.11.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 458015b12..be2a346bd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.0
+        image: sameersbn/gitlab:15.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From c0a2827cd299d72f532cbb63cb4ac24b080beeaf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 5 May 2023 17:01:23 +0200
Subject: [PATCH 0846/1124] Upgrade GitLab CE to 15.11.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7936f5288..ea33e4a46 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.2**
+
+- gitlab: upgrade CE to v15.11.2
+- gitaly: upgrade to v15.11.2
+- gitlab-pages: upgrade to v15.11.2
+
 **15.11.1**
 
 - gitlab: upgrade CE to v15.11.1
diff --git a/Dockerfile b/Dockerfile
index ba0388633..33a07388c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.1
+ARG VERSION=15.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7.8 \
     RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
     GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.1 \
-    GITALY_SERVER_VERSION=15.11.1 \
+    GITLAB_PAGES_VERSION=15.11.2 \
+    GITALY_SERVER_VERSION=15.11.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6d3de9cf1..ff708d701 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.1
+# sameersbn/gitlab:15.11.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.1
+docker pull sameersbn/gitlab:15.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.1
+ sameersbn/gitlab:15.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.1
+    sameersbn/gitlab:15.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:sanitize
+    sameersbn/gitlab:15.11.2 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake db:setup
+    sameersbn/gitlab:15.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.1
+docker pull sameersbn/gitlab:15.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.2
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 558cc008c..2677654c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.1
+15.11.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 2e32b35be..ad48faab5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2c617397c..f3cb76d9d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a4b7bc5e6..fca820033 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 03afaf677..eb26b09ba 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.1
+docker pull sameersbn/gitlab:15.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.1
+sameersbn/gitlab:15.11.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4789f3d78..461667a60 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 80ba3dab7..2f6e226c8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.1
+    image: sameersbn/gitlab:15.11.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index be2a346bd..d50d1b386 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.1
+        image: sameersbn/gitlab:15.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 632ca2bc17850644cf55070e595768ecf3fa48c4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 11 May 2023 20:12:09 +0200
Subject: [PATCH 0847/1124] Upgrade GitLab CE to 15.11.3

---
 Changelog.md                            |  7 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ea33e4a46..49779289c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.3**
+
+- gitlab: upgrade CE to v15.11.3
+- gitaly: upgrade to v15.11.3
+- gitlab-pages: upgrade to v15.11.3
+- ruby: upgrade to v3.0.6
+
 **15.11.2**
 
 - gitlab: upgrade CE to v15.11.2
diff --git a/Dockerfile b/Dockerfile
index 33a07388c..e966e52b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.2
+ARG VERSION=15.11.3
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=2.7.8 \
-    RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \
+    RUBY_VERSION=3.0.6 \
+    RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.2 \
-    GITALY_SERVER_VERSION=15.11.2 \
+    GITLAB_PAGES_VERSION=15.11.3 \
+    GITALY_SERVER_VERSION=15.11.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ff708d701..cbdeb9660 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.2
+# sameersbn/gitlab:15.11.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.2
+docker pull sameersbn/gitlab:15.11.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 ### Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 #### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 #### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.2
+ sameersbn/gitlab:15.11.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -760,14 +760,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.2
+    sameersbn/gitlab:15.11.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:sanitize
+    sameersbn/gitlab:15.11.3 app:sanitize
 ```
 
 #### Piwik
@@ -2425,7 +2425,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2460,14 +2460,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake db:setup
+    sameersbn/gitlab:15.11.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2525,7 +2525,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.2
+docker pull sameersbn/gitlab:15.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2623,7 +2623,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.3
 ```
 
 ### Shell Access
@@ -2661,7 +2661,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2677654c9..43d240373 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.2
+15.11.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ad48faab5..34678bf6b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f3cb76d9d..5786c1798 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fca820033..15e88f6e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index eb26b09ba..6aafe9416 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.2
+docker pull sameersbn/gitlab:15.11.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.2
+sameersbn/gitlab:15.11.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 461667a60..4f8cfaa13 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2f6e226c8..aab4e3408 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.2
+    image: sameersbn/gitlab:15.11.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d50d1b386..802194373 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.2
+        image: sameersbn/gitlab:15.11.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 260f548c5b4bd0c4e602740128aeca6058331f4d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 20 Apr 2023 18:59:25 +0900
Subject: [PATCH 0848/1124] Ship with multiple versions of postgresql-client
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is intended to work even in environments without an internet connection.

- Use latest version of pg_isready on checking database connection
- Switch postgresql-client version checking server on startup
- If the server versions do not match exactly, use the latest installed client
  and warn on docker log

From postgresql documentation:
https://www.postgresql.org/docs/15/app-pgdump.html#PG-DUMP-NOTES

> Also, it is not guaranteed that pg_dump's output can be loaded
> into a server of an older major version — not even if the dump
> was taken from a server of that version.

To switch client version, generate a file ~/.postgresqlrc with content like:

{server side major version} {server hostname}:{server port} {default database}

See detail on:
https://manpages.ubuntu.com/manpages/bionic/man5/postgresqlrc.5.html

Following messages appear on docker log:

- Detected server version: 140007
- Generating /home/git/.postgresqlrc
---
 Dockerfile               |  3 ++-
 assets/runtime/functions | 56 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e966e52b9..f0f245c9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,8 @@ RUN set -ex && \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \
+      nginx openssh-server postgresql-contrib redis-tools \
+      postgresql-client-12 postgresql-client-13 postgresql-client-14 postgresql-client-15 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 787ce5c8a..34a0a0e9b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -149,7 +149,7 @@ gitlab_finalize_database_parameters() {
 
 gitlab_check_database_connection() {
 
-  prog=$(find /usr/lib/postgresql/ -name pg_isready)
+  prog=$(find /usr/lib/postgresql/ -name pg_isready -type f | sort | tail -n1)
   prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1"
 
   timeout=60
@@ -167,11 +167,65 @@ gitlab_check_database_connection() {
   echo
 }
 
+gitlab_generate_postgresqlrc() {
+  echo "Configuring /home/${GITLAB_USER}/.postgresqlrc to avoid version mismatch on dumping"
+  # server_version_num property is a number built from version string:
+  # https://www.postgresql.org/docs/15/libpq-status.html#LIBPQ-PQSERVERVERSION 
+  # > The result is formed by multiplying the server's major version number by 10000 and adding the minor version number. 
+  # > For example, version 10.1 will be returned as 100001, and version 11.0 will be returned as 110000. Zero is returned if the connection is bad.
+  # >
+  # > Prior to major version 10, PostgreSQL used three-part version numbers in which the first two parts together represented the major version.
+  # > For those versions, PQserverVersion uses two digits for each part;
+  # > for example version 9.1.5 will be returned as 90105, and version 9.2.0 will be returned as 90200.
+  #
+  # This difference also appends to apt package name.
+  # For example, in ubuntu:focal, postgresql-client-{8.2, 8.3, 8.4, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15} are available.
+  # 
+  DB_SERVER_VERSION=$(PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "SHOW server_version_num")
+  if [[ "${DB_SERVER_VERSION}" -eq 0 ]]; then
+    echo
+    echo "Could not retrieve database server version correctly. Aborting..."
+    return 1
+  fi
+
+  echo "- Detected server version: ${DB_SERVER_VERSION}"
+
+  # Anyway, we can get major version (8, 9, 10 and so on) by dividing by 10000.
+  # DB_SERVER_VERSION_MAJOR=${DB_SERVER_VERSION%%.*}
+  DB_SERVER_VERSION_MAJOR=$((DB_SERVER_VERSION/10000))
+  DB_CLIENT_VERSION_PACKAGE_NAME=
+
+  if [[ "${DB_SERVER_VERSION_MAJOR}" -ge 10 ]]; then
+    # v10 or later: use "rought major version" as version number in package name
+    DB_CLIENT_VERSION_PACKAGE_NAME=${DB_SERVER_VERSION_MAJOR}
+  else
+    # prior to v10: convert
+    # FIXME: rough implementation
+    # It exploits the fact that there is no version such as 9.10, and it lacks versatility.
+    # divide by 100, then replace first 0 to comma
+    DB_CLIENT_VERSION_PACKAGE_NAME=$((DB_SERVER_VERSION/100))
+    DB_CLIENT_VERSION_PACKAGE_NAME=${DB_CLIENT_VERSION_PACKAGE_NAME/0/.}
+  fi
+
+  # if exact-match client not found, select latest version from installed clients
+  if [[ "$(apt-cache pkgnames postgresql-client | grep -e "-${DB_CLIENT_VERSION_PACKAGE_NAME}" | wc -l)" -ne 1 ]]; then
+    LATEST_CLIENT="$(apt-cache pkgnames postgresql-client | grep -v -e "-common" | sort --version-sort | tail -n1)"
+    DB_CLIENT_VERSION_PACKAGE_NAME=${LATEST_CLIENT/postgresql-client-/}
+    echo "gitlab_generate_postgresqlrc(): WARNING - Suitable client not installed. postgresql-client-${DB_CLIENT_VERSION_PACKAGE_NAME} will be used but you may face issue (database in backup will be empty, for example)"
+  fi
+
+  # generate ~/.postgresqlrc to switch client version
+  GITLAB_USER_POSTGRESQLRC="/home/${GITLAB_USER}/.postgresqlrc"
+  echo "- Generating ${GITLAB_USER_POSTGRESQLRC}"
+  echo "${DB_CLIENT_VERSION_PACKAGE_NAME} ${DB_HOST}:${DB_PORT} ${DB_NAME}" | exec_as_git tee "${GITLAB_USER_POSTGRESQLRC}"
+}
+
 gitlab_configure_database() {
   echo -n "Configuring gitlab::database"
 
   gitlab_finalize_database_parameters
   gitlab_check_database_connection
+  gitlab_generate_postgresqlrc
 
   update_template ${GITLAB_DATABASE_CONFIG} \
     DB_ENCODING \

From b3b700a7019a1a2a9f17a88f81d85cd2ec8a0e67 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 20 Apr 2023 18:59:44 +0900
Subject: [PATCH 0849/1124] Uninstall unused postgresql-client on startup

Unused clients are determinate by checking ~/.postgresqlrc
Uninstall logs like the following will appear in the docker log:

- Uninstalling unused version(s) of client: postgresql-client-12
---
 assets/runtime/functions | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 34a0a0e9b..4b0200753 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -220,12 +220,36 @@ gitlab_generate_postgresqlrc() {
   echo "${DB_CLIENT_VERSION_PACKAGE_NAME} ${DB_HOST}:${DB_PORT} ${DB_NAME}" | exec_as_git tee "${GITLAB_USER_POSTGRESQLRC}"
 }
 
+gitlab_uninstall_unused_database_client() {
+  if [[ -f "/home/${GITLAB_USER}/.postgresqlrc" ]]; then
+    # refer /home/${GITLAB_USER}/.postgresqlrc and pick up versions in use
+    # .postgresqlrc contains following information per line
+    #   database_major_version host:port database_name
+    # - ignore lines starts with # by specifying pattern /^[^#]/
+    # - first field is the version number in use.
+    # - cocnat whole lines into single string. convert newline to \|
+    #   this is escaped regex "OR"
+    # now we got the following regex that can be used as an option to grep:
+    #   \|-12\|-13
+    DB_CLIENT_VERSIONS_IN_USE="$(awk '/^[^#]/ {printf("\|-%s",$1)}' "/home/${GITLAB_USER}/.postgresqlrc")"
+
+    # we also need to keep postgresql-client-common package to switch based on ~/.postgresqlrc
+    REGEX_DB_CLIENT_VERSIONS_IN_USE="-common${DB_CLIENT_VERSIONS_IN_USE}"
+
+    # remove unused client using regex above
+    UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ')
+    echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}"
+    DEBIAN_FRONTEND=noninteractive apt-get -qq remove -- ${UNUSED_DB_CLIENTS} >/dev/null
+  fi
+}
+
 gitlab_configure_database() {
   echo -n "Configuring gitlab::database"
 
   gitlab_finalize_database_parameters
   gitlab_check_database_connection
   gitlab_generate_postgresqlrc
+  gitlab_uninstall_unused_database_client
 
   update_template ${GITLAB_DATABASE_CONFIG} \
     DB_ENCODING \

From b736b992d696c147703faa347c801c7360ebeb3b Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 21 May 2023 21:23:53 +0900
Subject: [PATCH 0850/1124] README.md: Add description about postgresql-client
 switching behavior

Co-authored by: Steven Achilles <steven.achilles@googlemail.com>
---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index cbdeb9660..3639dcc71 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,29 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 #### PostgreSQL
 
+**Important note:** This image is shipped with different versions of the `postgresql-client`.
+
+During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. All other versions of the `postgresql-client` are deleted at runtime.
+
+This behavior can be checked using the command `docker logs` and an output like the following should be available:
+
+````sh
+…
+Configuring gitlab::database
+- Installing postgresql client to avoid version mismatch on dumping
+-- Detected server version: 140007
+- Generating /home/git/.postgresqlrc
+14 postgresql:5432 gitlabhq_production
+- Uninstalling unused client(s): postgresql-client-12 postgresql-client-13 postgresql-client-15
+…
+````
+
+Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to
+
+- `postgresql-client-12`,
+- `postgresql-client-13`,
+- `postgresql-client-14`,
+- and `postgresql-client-15`.
 *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x
 
 ##### External PostgreSQL Server

From 69d490b75741dc08b84d88290149d31eb01d265a Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 23 May 2023 04:04:57 +0900
Subject: [PATCH 0851/1124] README.md: Add note for the case any version of
 client does not match

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3639dcc71..58b9996ff 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 **Important note:** This image is shipped with different versions of the `postgresql-client`.
 
-During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. All other versions of the `postgresql-client` are deleted at runtime.
+During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the client does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime.
 
 This behavior can be checked using the command `docker logs` and an output like the following should be available:
 

From 110a8d75abff870534bce4e21f7b40a18f058083 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 22 May 2023 21:14:14 +0200
Subject: [PATCH 0852/1124] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 58b9996ff..9cbda7198 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 **Important note:** This image is shipped with different versions of the `postgresql-client`.
 
-During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the client does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime.
+During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime.
 
 This behavior can be checked using the command `docker logs` and an output like the following should be available:
 
@@ -263,6 +263,7 @@ Please note furthermore, that only combatible versions of the `postgresql-client
 - `postgresql-client-13`,
 - `postgresql-client-14`,
 - and `postgresql-client-15`.
+
 *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x
 
 ##### External PostgreSQL Server

From 72aa6828682691c072a7628c2dd8af2f1a9ed65d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 22 May 2023 21:59:49 +0200
Subject: [PATCH 0853/1124] Upgrade GitLab CE to 15.11.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 49779289c..e28fc5191 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.4**
+
+- gitlab: upgrade CE to v15.11.4
+- gitaly: upgrade to v15.11.4
+- gitlab-pages: upgrade to v15.11.4
+
 **15.11.3**
 
 - gitlab: upgrade CE to v15.11.3
diff --git a/Dockerfile b/Dockerfile
index f0f245c9c..03191ad78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.3
+ARG VERSION=15.11.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.3 \
-    GITALY_SERVER_VERSION=15.11.3 \
+    GITLAB_PAGES_VERSION=15.11.4 \
+    GITALY_SERVER_VERSION=15.11.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9cbda7198..bf5516bff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.3
+# sameersbn/gitlab:15.11.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.3
+docker pull sameersbn/gitlab:15.11.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.3
+ sameersbn/gitlab:15.11.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.3
+    sameersbn/gitlab:15.11.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:sanitize
+    sameersbn/gitlab:15.11.4 app:sanitize
 ```
 
 #### Piwik
@@ -2449,7 +2449,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2484,14 +2484,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake db:setup
+    sameersbn/gitlab:15.11.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2549,7 +2549,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.3
+docker pull sameersbn/gitlab:15.11.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2647,7 +2647,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.4
 ```
 
 ### Shell Access
@@ -2685,7 +2685,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 43d240373..35a0a8cbe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.3
+15.11.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 34678bf6b..dfb9b2ee0 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 5786c1798..72552cd4d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 15e88f6e5..d4fbbe237 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6aafe9416..87d951b1c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.3
+docker pull sameersbn/gitlab:15.11.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.3
+sameersbn/gitlab:15.11.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 4f8cfaa13..295752e1e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index aab4e3408..8c8f1006c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.3
+    image: sameersbn/gitlab:15.11.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 802194373..e89ccfe8c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.3
+        image: sameersbn/gitlab:15.11.4
         env:
         - name: TZ
           value: Asia/Kolkata

From f9e3ae132e44b4e8856013515de1d01ad5d2e81d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 22 May 2023 22:05:21 +0200
Subject: [PATCH 0854/1124] Upgrade GitLab CE to 15.11.5

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e28fc5191..fabd74f8e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**15.11.5**
+
+- gitlab: upgrade CE to v15.11.5
+- gitaly: upgrade to v15.11.5
+- gitlab-pages: upgrade to v15.11.5
+
 **15.11.4**
 
 - gitlab: upgrade CE to v15.11.4
diff --git a/Dockerfile b/Dockerfile
index 03191ad78..9fdeb18cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.4
+ARG VERSION=15.11.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.4 \
-    GITALY_SERVER_VERSION=15.11.4 \
+    GITLAB_PAGES_VERSION=15.11.5 \
+    GITALY_SERVER_VERSION=15.11.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bf5516bff..bceda684e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.4
+# sameersbn/gitlab:15.11.5
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.4
+docker pull sameersbn/gitlab:15.11.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.4
+ sameersbn/gitlab:15.11.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.4
+    sameersbn/gitlab:15.11.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:sanitize
+    sameersbn/gitlab:15.11.5 app:sanitize
 ```
 
 #### Piwik
@@ -2449,7 +2449,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2484,14 +2484,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake db:setup
+    sameersbn/gitlab:15.11.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2549,7 +2549,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:env:info
+    sameersbn/gitlab:15.11.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:15.11.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.4
+docker pull sameersbn/gitlab:15.11.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2647,7 +2647,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.5
 ```
 
 ### Shell Access
@@ -2685,7 +2685,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 35a0a8cbe..1a4cce617 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.4
+15.11.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index dfb9b2ee0..477f273ae 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 72552cd4d..6906d67c0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d4fbbe237..db3b4e105 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 87d951b1c..6a11b1ead 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.4
+docker pull sameersbn/gitlab:15.11.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.4
+sameersbn/gitlab:15.11.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 295752e1e..45531ad74 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8c8f1006c..d7eef6251 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.4
+    image: sameersbn/gitlab:15.11.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e89ccfe8c..e07b98530 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.4
+        image: sameersbn/gitlab:15.11.5
         env:
         - name: TZ
           value: Asia/Kolkata

From 24e2b581fbcbd6dc60187c2423c87e123f87090d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 24 May 2023 20:26:06 +0900
Subject: [PATCH 0855/1124] Use `purge` instead to uninstall unused db clients

Instead of `remove` that does not remove actual files.

Co-authored-by: @f-io
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4b0200753..45e70b5d6 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -239,7 +239,7 @@ gitlab_uninstall_unused_database_client() {
     # remove unused client using regex above
     UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ')
     echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}"
-    DEBIAN_FRONTEND=noninteractive apt-get -qq remove -- ${UNUSED_DB_CLIENTS} >/dev/null
+    DEBIAN_FRONTEND=noninteractive apt-get -qq purge -- ${UNUSED_DB_CLIENTS} >/dev/null
   fi
 }
 

From 598a6666932ab1a703efc1c8f99ec70701b11d77 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 25 May 2023 12:44:32 +0900
Subject: [PATCH 0856/1124] Add `-y` option on uninstalling unused db client

Co-authored-by: Steven Achilles <steven.achilles@googlemail.com>
Co-authored-by: @f-io
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 45e70b5d6..e445c913e 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -239,7 +239,7 @@ gitlab_uninstall_unused_database_client() {
     # remove unused client using regex above
     UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ')
     echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}"
-    DEBIAN_FRONTEND=noninteractive apt-get -qq purge -- ${UNUSED_DB_CLIENTS} >/dev/null
+    DEBIAN_FRONTEND=noninteractive apt-get -qq -y purge -- ${UNUSED_DB_CLIENTS} >/dev/null
   fi
 }
 

From fcd5297d5dab1f383383e5ff7826a4bda3e77f98 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 23 May 2023 21:14:16 +0200
Subject: [PATCH 0857/1124] Remove postgresql-client-12

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

diff --git a/Dockerfile b/Dockerfile
index 9fdeb18cd..481c241c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex && \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-contrib redis-tools \
-      postgresql-client-12 postgresql-client-13 postgresql-client-14 postgresql-client-15 \
+      postgresql-client-13 postgresql-client-14 postgresql-client-15 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \

From be00b11ea2733c62b9f1ada9e40c8c90c2af2ba5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 24 May 2023 06:14:43 +0200
Subject: [PATCH 0858/1124] Include Postgres requirements in mail template

---
 scripts/release-notes.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index a9db77813..0c84db159 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -38,7 +38,9 @@ For installation and usage instructions please refer to the [README](https://git
 
 Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent.
 
-Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) *before* upgrading your GitLab CE instance!
+Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance!
+
+**GitLab 16.0 requires at least PostgreSQL 13.**
 
 You are kindly invited to provide contributions.
 

From 5fc732eb3cf6782202eb263b9002c2f53aa824e3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 24 May 2023 17:13:38 +0200
Subject: [PATCH 0859/1124] Add new configuration options for database.yml

---
 assets/build/config/database.yml.postgresql | 44 +++++++++++++++++++++
 assets/runtime/config/gitlabhq/database.yml | 10 ++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/assets/build/config/database.yml.postgresql b/assets/build/config/database.yml.postgresql
index 180f8b018..198db0000 100644
--- a/assets/build/config/database.yml.postgresql
+++ b/assets/build/config/database.yml.postgresql
@@ -29,6 +29,14 @@ production:
     #     port: 8600
     #     record: secondary.postgresql.service.consul
     #     interval: 300
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_production
+    database_tasks: false
+    username: git
+    password: "secure password"
+    host: localhost
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -50,6 +58,16 @@ development:
     host: localhost
     variables:
       statement_timeout: 15s
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_development
+    database_tasks: false
+    username: postgres
+    password: "secure password"
+    host: localhost
+    variables:
+      statement_timeout: 15s
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -69,6 +87,14 @@ staging:
     username: git
     password: "secure password"
     host: localhost
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_staging
+    database_tasks: false
+    username: git
+    password: "secure password"
+    host: localhost
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -91,6 +117,17 @@ test: &test
     prepared_statements: false
     variables:
       statement_timeout: 15s
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_test
+    database_tasks: false
+    username: postgres
+    password:
+    host: localhost
+    prepared_statements: false
+    variables:
+      statement_timeout: 15s
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -98,3 +135,10 @@ test: &test
 #    username: postgres
 #    password:
 #    host: localhost
+#  embedding:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_embedding_test
+#    username: postgres
+#    password:
+#    host: localhost
diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index 0423a57c4..a18e55c74 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -12,4 +12,12 @@ production:
     password: "{{DB_PASS}}"
     pool: {{DB_POOL}}
     prepared_statements: {{DB_PREPARED_STATEMENTS}}
-
+  ci:
+    adapter: postgresql
+    encoding: {{DB_ENCODING}}
+    database: {{DB_NAME}}
+    database_tasks: false
+    host: {{DB_HOST}}
+    port: {{DB_PORT}}
+    username: {{DB_USER}}
+    password: "{{DB_PASS}}"

From 88148ec146799807a3edd67d8a4ed1ae61f7961d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 24 May 2023 17:35:43 +0200
Subject: [PATCH 0860/1124] Upgrade GitLab CE to 16.0.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fabd74f8e..d7696db14 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.0.0**
+
+- gitlab: upgrade CE to v16.0.0
+- gitaly: upgrade to v16.0.0
+- gitlab-pages: upgrade to v16.0.0
+- gitlab-shell: upgrade to v14.20.0
+
 **15.11.5**
 
 - gitlab: upgrade CE to v15.11.5
diff --git a/Dockerfile b/Dockerfile
index 481c241c3..491e81332 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=15.11.5
+ARG VERSION=16.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.4 \
-    GITLAB_SHELL_VERSION=14.18.0 \
-    GITLAB_PAGES_VERSION=15.11.5 \
-    GITALY_SERVER_VERSION=15.11.5 \
+    GITLAB_SHELL_VERSION=14.20.0 \
+    GITLAB_PAGES_VERSION=16.0.0 \
+    GITALY_SERVER_VERSION=16.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bceda684e..af4544ff5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:15.11.5
+# sameersbn/gitlab:16.0.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.5
+docker pull sameersbn/gitlab:16.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:15.11.5
+ sameersbn/gitlab:16.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:15.11.5
+    sameersbn/gitlab:16.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:sanitize
+    sameersbn/gitlab:16.0.0 app:sanitize
 ```
 
 #### Piwik
@@ -2449,7 +2449,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2484,14 +2484,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake db:setup
+    sameersbn/gitlab:16.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2549,7 +2549,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:15.11.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.5
+docker pull sameersbn/gitlab:16.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2647,7 +2647,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.0
 ```
 
 ### Shell Access
@@ -2685,7 +2685,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1a4cce617..946789e61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.5
+16.0.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 477f273ae..c6d65406c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6906d67c0..07d4355a2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index db3b4e105..0500cd0d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6a11b1ead..57ef4f177 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:15.11.5
+docker pull sameersbn/gitlab:16.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:15.11.5
+sameersbn/gitlab:16.0.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 45531ad74..09c14f527 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d7eef6251..cfd674847 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:15.11.5
+    image: sameersbn/gitlab:16.0.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e07b98530..dbe44a4a0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:15.11.5
+        image: sameersbn/gitlab:16.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 230284ebcf54f8ca7ada56d78d352a2d37f750d2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 25 May 2023 18:14:23 +0200
Subject: [PATCH 0861/1124] Do not copy ruby by installing gitaly

---
 assets/build/install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index b84cbe902..b266654d4 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -146,7 +146,12 @@ git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLA
 # install gitaly
 make -C ${GITLAB_GITALY_BUILD_DIR} install
 mkdir -p ${GITLAB_GITALY_INSTALL_DIR}
-cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/
+# The following line causes some issues. However, according to
+# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5512> and 
+# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5671> there seems to
+# be some attempts to remove ruby from gitaly.
+#
+# cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/
 cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
 rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache
 chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}

From 5d215d6f25f41d45faa925dd6b2963507261dd07 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 25 May 2023 21:05:54 +0200
Subject: [PATCH 0862/1124] Upgrade GitLab CE to 16.0.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d7696db14..b86da0d25 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.0.1**
+
+- gitlab: upgrade CE to v16.0.1
+- gitaly: upgrade to v16.0.1
+- gitlab-pages: upgrade to v16.0.1
+
 **16.0.0**
 
 - gitlab: upgrade CE to v16.0.0
diff --git a/Dockerfile b/Dockerfile
index 491e81332..e19634b0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=16.0.0
+ARG VERSION=16.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.4 \
     GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.0 \
-    GITALY_SERVER_VERSION=16.0.0 \
+    GITLAB_PAGES_VERSION=16.0.1 \
+    GITALY_SERVER_VERSION=16.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index af4544ff5..d88fd1e4a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.0
+# sameersbn/gitlab:16.0.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.0
+docker pull sameersbn/gitlab:16.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.0
+ sameersbn/gitlab:16.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.0
+    sameersbn/gitlab:16.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:sanitize
+    sameersbn/gitlab:16.0.1 app:sanitize
 ```
 
 #### Piwik
@@ -2449,7 +2449,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2484,14 +2484,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake db:setup
+    sameersbn/gitlab:16.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2549,7 +2549,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.0
+docker pull sameersbn/gitlab:16.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2647,7 +2647,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.1
 ```
 
 ### Shell Access
@@ -2685,7 +2685,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 946789e61..7141108f1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.0
+16.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c6d65406c..64b8f83c4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 07d4355a2..d6c339213 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 0500cd0d9..60980975b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 57ef4f177..78adeba89 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.0
+docker pull sameersbn/gitlab:16.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.0
+sameersbn/gitlab:16.0.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 09c14f527..7f744b562 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cfd674847..53c470750 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.0
+    image: sameersbn/gitlab:16.0.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dbe44a4a0..32dfbd13f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.0
+        image: sameersbn/gitlab:16.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 7140f0342b6d8aadd6e2b0ff7fd74f22a23a5e68 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 2 Jun 2023 22:12:29 +0900
Subject: [PATCH 0863/1124] Fix unused client removal on restarted container

Handle the case where the target does not exist
in the process of deleting unused clients.
Such a situation will not occur in newly launched containers,
but will occur if they are restarted.

During container restarts, container status are preserved.
If the unused database client was deleted in the last run,
grep will not match anything.
It returns non-zero code and the container stops there
because entrypoint sets option `-e`
(exit immediately on non-zero exit code excluding some special cases)

This commit make the uninstall process to handle the case
UNUSED_DB_CLIENTS is empty.
---
 assets/runtime/functions | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index e445c913e..496a28e0c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -237,7 +237,16 @@ gitlab_uninstall_unused_database_client() {
     REGEX_DB_CLIENT_VERSIONS_IN_USE="-common${DB_CLIENT_VERSIONS_IN_USE}"
 
     # remove unused client using regex above
-    UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ')
+    # grep may return non-zero code on mo match, so fake the exit code with the `|| true` to swallow that
+    UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" || true)
+    if [[ "${UNUSED_DB_CLIENTS}" == "" ]]; then
+      echo "- All installed version of clients are in use. Did not uninstalled any client..."
+      return
+    fi
+
+    # just to get clean log, convert newline (package name delimiter) to single whitespace
+    UNUSED_DB_CLIENTS=$(echo ${UNUSED_DB_CLIENTS} | tr '\n' ' ')
+
     echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}"
     DEBIAN_FRONTEND=noninteractive apt-get -qq -y purge -- ${UNUSED_DB_CLIENTS} >/dev/null
   fi

From 2e7102401ace7ba290a63419ca870ad0995f117f Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 7 Jun 2023 22:32:26 +0900
Subject: [PATCH 0864/1124] README: postgresql-client-12 no longer contained

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index d88fd1e4a..65d5448cf 100644
--- a/README.md
+++ b/README.md
@@ -259,7 +259,6 @@ Configuring gitlab::database
 
 Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to
 
-- `postgresql-client-12`,
 - `postgresql-client-13`,
 - `postgresql-client-14`,
 - and `postgresql-client-15`.

From df09358dce5962a39a052d41a0228ff8b100e76e Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 7 Jun 2023 22:36:52 +0900
Subject: [PATCH 0865/1124] README: Fix typo in note about postgresql-client

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 65d5448cf..fae3b64d3 100644
--- a/README.md
+++ b/README.md
@@ -257,7 +257,7 @@ Configuring gitlab::database
 …
 ````
 
-Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to
+Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belong to
 
 - `postgresql-client-13`,
 - `postgresql-client-14`,

From e123975ab8747faba01bea51d39d8366388a8e0a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 7 Jun 2023 14:50:58 +0200
Subject: [PATCH 0866/1124] Upgrade GitLab CE to 16.0.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b86da0d25..38bf99a45 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,13 @@ This file only reflects the changes that are made in this image. Please refer to
 
 **16.0.1**
 
+- gitlab: upgrade CE to v16.0.2
+- gitaly: upgrade to v16.0.2
+- gitlab-pages: upgrade to v16.0.2
+- golang: upgrade to v1.20.5
+
+**16.0.1**
+
 - gitlab: upgrade CE to v16.0.1
 - gitaly: upgrade to v16.0.1
 - gitlab-pages: upgrade to v16.0.1
diff --git a/Dockerfile b/Dockerfile
index e19634b0e..5bf6486ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=16.0.1
+ARG VERSION=16.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.20.4 \
+    GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.1 \
-    GITALY_SERVER_VERSION=16.0.1 \
+    GITLAB_PAGES_VERSION=16.0.2 \
+    GITALY_SERVER_VERSION=16.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index fae3b64d3..176967695 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.1
+# sameersbn/gitlab:16.0.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.1
+docker pull sameersbn/gitlab:16.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.1
+ sameersbn/gitlab:16.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.1
+    sameersbn/gitlab:16.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:sanitize
+    sameersbn/gitlab:16.0.2 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake db:setup
+    sameersbn/gitlab:16.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.1
+docker pull sameersbn/gitlab:16.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.2
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7141108f1..d04447a1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.1
+16.0.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 64b8f83c4..6829d93ed 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d6c339213..118cada51 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 60980975b..d872a72d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 78adeba89..aa67e7b9f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.1
+docker pull sameersbn/gitlab:16.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.1
+sameersbn/gitlab:16.0.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7f744b562..775dea621 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 53c470750..53d5f6874 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.1
+    image: sameersbn/gitlab:16.0.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 32dfbd13f..555f3fa94 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.1
+        image: sameersbn/gitlab:16.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 983922b5f5a8f50becb020a0184d44bd447a981e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 7 Jun 2023 17:54:29 +0200
Subject: [PATCH 0867/1124] Update Changelog.md

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 38bf99a45..0e8159a58 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,7 +2,7 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**16.0.1**
+**16.0.2**
 
 - gitlab: upgrade CE to v16.0.2
 - gitaly: upgrade to v16.0.2

From df4a0934042a6f2a724a07bc6b3dc393645933c6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 7 Jun 2023 14:55:50 +0200
Subject: [PATCH 0868/1124] Upgrade GitLab CE to 16.0.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0e8159a58..0c5157a92 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.0.3**
+
+- gitlab: upgrade CE to v16.0.3
+- gitaly: upgrade to v16.0.3
+- gitlab-pages: upgrade to v16.0.3
+
 **16.0.2**
 
 - gitlab: upgrade CE to v16.0.2
diff --git a/Dockerfile b/Dockerfile
index 5bf6486ed..2eb92862d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=16.0.2
+ARG VERSION=16.0.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.2 \
-    GITALY_SERVER_VERSION=16.0.2 \
+    GITLAB_PAGES_VERSION=16.0.3 \
+    GITALY_SERVER_VERSION=16.0.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 176967695..5c1f665a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.2
+# sameersbn/gitlab:16.0.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.2
+docker pull sameersbn/gitlab:16.0.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.2
+ sameersbn/gitlab:16.0.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.2
+    sameersbn/gitlab:16.0.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:sanitize
+    sameersbn/gitlab:16.0.3 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake db:setup
+    sameersbn/gitlab:16.0.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.2
+docker pull sameersbn/gitlab:16.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.3
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d04447a1e..04627b68d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.2
+16.0.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6829d93ed..df6c50aeb 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 118cada51..5a4b01667 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d872a72d9..4ac916ab5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index aa67e7b9f..271d0d398 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.2
+docker pull sameersbn/gitlab:16.0.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.2
+sameersbn/gitlab:16.0.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 775dea621..fc6d477df 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 53d5f6874..411ff814e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.2
+    image: sameersbn/gitlab:16.0.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 555f3fa94..9b09b8f90 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.2
+        image: sameersbn/gitlab:16.0.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 7718f194a544dbc6636a7e4a954d47a72126257d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 14 Jun 2023 20:56:35 +0200
Subject: [PATCH 0869/1124] Upgrade GitLab CE to 16.0.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0c5157a92..243b2b997 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.0.4**
+
+- gitlab: upgrade CE to v16.0.4
+- gitaly: upgrade to v16.0.4
+- gitlab-pages: upgrade to v16.0.4
+
 **16.0.3**
 
 - gitlab: upgrade CE to v16.0.3
diff --git a/Dockerfile b/Dockerfile
index 2eb92862d..01f17a2ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230412
 
-ARG VERSION=16.0.3
+ARG VERSION=16.0.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.3 \
-    GITALY_SERVER_VERSION=16.0.3 \
+    GITLAB_PAGES_VERSION=16.0.4 \
+    GITALY_SERVER_VERSION=16.0.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5c1f665a9..2c3e17622 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.3
+# sameersbn/gitlab:16.0.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.3
+docker pull sameersbn/gitlab:16.0.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.3
+ sameersbn/gitlab:16.0.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.3
+    sameersbn/gitlab:16.0.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:sanitize
+    sameersbn/gitlab:16.0.4 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake db:setup
+    sameersbn/gitlab:16.0.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.3
+docker pull sameersbn/gitlab:16.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.4
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 04627b68d..05b505513 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.3
+16.0.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index df6c50aeb..162dc0b89 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 5a4b01667..b3d6cfcc3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ac916ab5..a2475666d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 271d0d398..324194727 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.3
+docker pull sameersbn/gitlab:16.0.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.3
+sameersbn/gitlab:16.0.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index fc6d477df..b4b78f411 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 411ff814e..1cd53cc15 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.3
+    image: sameersbn/gitlab:16.0.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 9b09b8f90..4c32e5042 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.3
+        image: sameersbn/gitlab:16.0.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 208b1e81b2b0ba093d981c621d334bda22f4f305 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 18 Jun 2023 09:29:36 +0200
Subject: [PATCH 0870/1124] Upgrade GitLab CE to 16.0.5

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 243b2b997..26dce0b0e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.0.5**
+
+- gitlab: upgrade CE to v16.0.45
+- gitaly: upgrade to v16.0.5
+- gitlab-pages: upgrade to v16.0.5
+- ubuntu: upgrade to focal-20230605
+
 **16.0.4**
 
 - gitlab: upgrade CE to v16.0.4
diff --git a/Dockerfile b/Dockerfile
index 01f17a2ad..ce1ecd1d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230412
+FROM ubuntu:focal-20230605
 
-ARG VERSION=16.0.4
+ARG VERSION=16.0.5
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.4 \
-    GITALY_SERVER_VERSION=16.0.4 \
+    GITLAB_PAGES_VERSION=16.0.5 \
+    GITALY_SERVER_VERSION=16.0.5 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2c3e17622..a4f476636 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.4
+# sameersbn/gitlab:16.0.5
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.4
+docker pull sameersbn/gitlab:16.0.5
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.4
+ sameersbn/gitlab:16.0.5
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.4
+    sameersbn/gitlab:16.0.5
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:sanitize
+    sameersbn/gitlab:16.0.5 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake db:setup
+    sameersbn/gitlab:16.0.5 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:env:info
+    sameersbn/gitlab:16.0.5 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.4
+docker pull sameersbn/gitlab:16.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.5
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 05b505513..e85a0ad07 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.4
+16.0.5
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 162dc0b89..b4bfdfe5e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b3d6cfcc3..ba61d7c14 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a2475666d..c92c4c77d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 324194727..6b48b4a6d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.4
+docker pull sameersbn/gitlab:16.0.5
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.4
+sameersbn/gitlab:16.0.5
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b4b78f411..8e3dfb390 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1cd53cc15..789466dc1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.4
+    image: sameersbn/gitlab:16.0.5
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4c32e5042..6da779c2d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.4
+        image: sameersbn/gitlab:16.0.5
         env:
         - name: TZ
           value: Asia/Kolkata

From a63405d433d39e0c6f5d863c5083792d277fd542 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 18 Jun 2023 09:42:35 +0200
Subject: [PATCH 0871/1124] Add pool option to database.yml

---
 assets/runtime/config/gitlabhq/database.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index a18e55c74..6ca70ad2a 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -21,3 +21,4 @@ production:
     port: {{DB_PORT}}
     username: {{DB_USER}}
     password: "{{DB_PASS}}"
+    pool: {{DB_POOL}}

From b2062dd6e2f54662d67da99795606aa0f91529e8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 23 Jun 2023 19:21:50 +0200
Subject: [PATCH 0872/1124] Upgrade GitLab CE to 16.1.0

---
 Changelog.md                            |  9 ++++-
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 26dce0b0e..be5efc6d9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,9 +2,16 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.1.0**
+
+- gitlab: upgrade CE to v16.1.0
+- gitaly: upgrade to v16.1.0
+- gitlab-pages: upgrade to v16.1.0
+- gitlab-shell: upgrade to v14.23.0
+
 **16.0.5**
 
-- gitlab: upgrade CE to v16.0.45
+- gitlab: upgrade CE to v16.0.5
 - gitaly: upgrade to v16.0.5
 - gitlab-pages: upgrade to v16.0.5
 - ubuntu: upgrade to focal-20230605
diff --git a/Dockerfile b/Dockerfile
index ce1ecd1d2..a24aa1121 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230605
 
-ARG VERSION=16.0.5
+ARG VERSION=16.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
-    GITLAB_SHELL_VERSION=14.20.0 \
-    GITLAB_PAGES_VERSION=16.0.5 \
-    GITALY_SERVER_VERSION=16.0.5 \
+    GITLAB_SHELL_VERSION=14.23.0 \
+    GITLAB_PAGES_VERSION=16.1.0 \
+    GITALY_SERVER_VERSION=16.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a4f476636..39bba8438 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.0.5
+# sameersbn/gitlab:16.1.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.5
+docker pull sameersbn/gitlab:16.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.0.5
+ sameersbn/gitlab:16.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.0.5
+    sameersbn/gitlab:16.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:sanitize
+    sameersbn/gitlab:16.1.0 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake db:setup
+    sameersbn/gitlab:16.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:env:info
+    sameersbn/gitlab:16.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.0.5` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.5
+docker pull sameersbn/gitlab:16.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.5
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.0
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e85a0ad07..e0228cf18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.5
+16.1.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b4bfdfe5e..5e3bffd21 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ba61d7c14..26d7c7231 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c92c4c77d..f3f9872b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6b48b4a6d..37b29884d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.0.5
+docker pull sameersbn/gitlab:16.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.0.5
+sameersbn/gitlab:16.1.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8e3dfb390..926052a34 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 789466dc1..ad3b7dff2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.0.5
+    image: sameersbn/gitlab:16.1.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6da779c2d..d5731d2d9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.0.5
+        image: sameersbn/gitlab:16.1.0
         env:
         - name: TZ
           value: Asia/Kolkata

From fbb9a7422b4572e0f1d5029747a8a96af0318aee Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 24 Jun 2023 08:40:57 +0200
Subject: [PATCH 0873/1124] Update puma.rb

---
 assets/runtime/config/gitlabhq/puma.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
index f48ff788a..df5b5eeac 100644
--- a/assets/runtime/config/gitlabhq/puma.rb
+++ b/assets/runtime/config/gitlabhq/puma.rb
@@ -39,7 +39,6 @@
 workers {{PUMA_WORKERS}}
 
 require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events"
-require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/puma_worker_killer_initializer"
 
 on_restart do
   # Signal application hooks that we're about to restart
@@ -60,6 +59,11 @@
   Gitlab::Cluster::LifecycleEvents.do_worker_start
 end
 
+on_worker_shutdown do
+  # Signal application hooks that a worker is shutting down
+  Gitlab::Cluster::LifecycleEvents.do_worker_stop
+end
+
 # Preload the application before starting the workers; this conflicts with
 # phased restart feature. (off by default)
 preload_app!
@@ -72,6 +76,9 @@
 #
 worker_timeout {{PUMA_TIMEOUT}}
 
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
+wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+
 # Use json formatter
 require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma_logging/json_formatter"
 
@@ -79,3 +86,12 @@
 log_formatter do |str|
   json_formatter.call(str)
 end
+
+lowlevel_error_handler do |ex, env|
+  if Raven.configuration.capture_allowed?
+    Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
+  end
+
+  # note the below is just a Rack response
+  [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+end

From ec8eb9c5687ac7f883fdbd1d350b8ff17f0da522 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 1 Jul 2023 10:02:57 +0200
Subject: [PATCH 0874/1124] Upgrade GitLab CE to 16.1.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index be5efc6d9..d9c69046d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.1.1**
+
+- gitlab: upgrade CE to v16.1.1
+- gitaly: upgrade to v16.1.1
+- gitlab-pages: upgrade to v16.1.1
+
 **16.1.0**
 
 - gitlab: upgrade CE to v16.1.0
diff --git a/Dockerfile b/Dockerfile
index a24aa1121..14113847a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230605
 
-ARG VERSION=16.1.0
+ARG VERSION=16.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.1.0 \
-    GITALY_SERVER_VERSION=16.1.0 \
+    GITLAB_PAGES_VERSION=16.1.1 \
+    GITALY_SERVER_VERSION=16.1.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 39bba8438..fc5d0c58a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.1.0
+# sameersbn/gitlab:16.1.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.0
+docker pull sameersbn/gitlab:16.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.1.0
+ sameersbn/gitlab:16.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.1.0
+    sameersbn/gitlab:16.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:sanitize
+    sameersbn/gitlab:16.1.1 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake db:setup
+    sameersbn/gitlab:16.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.0
+docker pull sameersbn/gitlab:16.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.1
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e0228cf18..1afe54c7b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.1.0
+16.1.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5e3bffd21..cff55e926 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 26d7c7231..a4c302a96 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f3f9872b5..a88399f19 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 37b29884d..1c898bcbb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.0
+docker pull sameersbn/gitlab:16.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.1.0
+sameersbn/gitlab:16.1.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 926052a34..ccfdbbba1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ad3b7dff2..ecd41aded 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.0
+    image: sameersbn/gitlab:16.1.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d5731d2d9..63d2cbb73 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.1.0
+        image: sameersbn/gitlab:16.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From fc33f9e90f02815a8b501ee09d208dc6e70b0be7 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 6 Jul 2023 22:01:01 +0200
Subject: [PATCH 0875/1124] Upgrade GitLab CE to 16.1.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d9c69046d..07fd004f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.1.2**
+
+- gitlab: upgrade CE to v16.1.2
+- gitaly: upgrade to v16.1.2
+- gitlab-pages: upgrade to v16.1.2
+- ubuntu: upgrade to focal-20230624
+
 **16.1.1**
 
 - gitlab: upgrade CE to v16.1.1
diff --git a/Dockerfile b/Dockerfile
index 14113847a..3cda1247c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230605
+FROM ubuntu:focal-20230624
 
-ARG VERSION=16.1.1
+ARG VERSION=16.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.5 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.1.1 \
-    GITALY_SERVER_VERSION=16.1.1 \
+    GITLAB_PAGES_VERSION=16.1.2 \
+    GITALY_SERVER_VERSION=16.1.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index fc5d0c58a..38766c58a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.1.1
+# sameersbn/gitlab:16.1.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.1
+docker pull sameersbn/gitlab:16.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.1.1
+ sameersbn/gitlab:16.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.1.1
+    sameersbn/gitlab:16.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:sanitize
+    sameersbn/gitlab:16.1.2 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake db:setup
+    sameersbn/gitlab:16.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.1
+docker pull sameersbn/gitlab:16.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.2
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1afe54c7b..2393940e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.1.1
+16.1.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cff55e926..6b347e75b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a4c302a96..7bd79e145 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a88399f19..7c932569f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1c898bcbb..5e7504894 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.1
+docker pull sameersbn/gitlab:16.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.1.1
+sameersbn/gitlab:16.1.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ccfdbbba1..d01fd8e32 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ecd41aded..4f51d2b7a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.1
+    image: sameersbn/gitlab:16.1.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 63d2cbb73..b77d5a80b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.1.1
+        image: sameersbn/gitlab:16.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From eb5130f86e5e46feb1aab0ea861d7788af035916 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 22 Jul 2023 18:46:31 +0200
Subject: [PATCH 0876/1124] Upgrade GitLab CE to 16.2.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 07fd004f5..5cdbc0cc8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.2.0**
+
+- gitlab: upgrade CE to v16.2.0
+- gitaly: upgrade to v16.2.0
+- gitlab-pages: upgrade to v16.2.0
+- golang: upgrade to v1.20.6
+
 **16.1.2**
 
 - gitlab: upgrade CE to v16.1.2
diff --git a/Dockerfile b/Dockerfile
index 3cda1247c..31868bb95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230624
 
-ARG VERSION=16.1.2
+ARG VERSION=16.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.20.5 \
+    GOLANG_VERSION=1.20.6 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.1.2 \
-    GITALY_SERVER_VERSION=16.1.2 \
+    GITLAB_PAGES_VERSION=16.2.0 \
+    GITALY_SERVER_VERSION=16.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 38766c58a..b48732a51 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.1.2
+# sameersbn/gitlab:16.2.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.2
+docker pull sameersbn/gitlab:16.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.1.2
+ sameersbn/gitlab:16.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.1.2
+    sameersbn/gitlab:16.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:sanitize
+    sameersbn/gitlab:16.2.0 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake db:setup
+    sameersbn/gitlab:16.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.2
+docker pull sameersbn/gitlab:16.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.0
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2393940e1..fd1bd70b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.1.2
+16.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6b347e75b..6d09c1a80 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7bd79e145..616fd42e9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c932569f..c4cc02167 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5e7504894..9fd56bbfe 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.1.2
+docker pull sameersbn/gitlab:16.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.1.2
+sameersbn/gitlab:16.2.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d01fd8e32..1bdf8151f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4f51d2b7a..ad96eab45 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.1.2
+    image: sameersbn/gitlab:16.2.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b77d5a80b..d8a24cb34 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.1.2
+        image: sameersbn/gitlab:16.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ecd2b35bdfa20c6b0c9f230916bad2576777c26b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 28 Jul 2023 19:15:23 +0200
Subject: [PATCH 0877/1124] Upgrade GitLab CE to 16.2.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5cdbc0cc8..6ccbe6d30 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.2.1**
+
+- gitlab: upgrade CE to v16.2.1
+- gitaly: upgrade to v16.2.1
+- gitlab-pages: upgrade to v16.2.1
+
 **16.2.0**
 
 - gitlab: upgrade CE to v16.2.0
diff --git a/Dockerfile b/Dockerfile
index 31868bb95..f7abcbd65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230624
 
-ARG VERSION=16.2.0
+ARG VERSION=16.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.6 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.2.0 \
-    GITALY_SERVER_VERSION=16.2.0 \
+    GITLAB_PAGES_VERSION=16.2.1 \
+    GITALY_SERVER_VERSION=16.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b48732a51..d4f783c5e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.2.0
+# sameersbn/gitlab:16.2.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.0
+docker pull sameersbn/gitlab:16.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.2.0
+ sameersbn/gitlab:16.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.2.0
+    sameersbn/gitlab:16.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:sanitize
+    sameersbn/gitlab:16.2.1 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake db:setup
+    sameersbn/gitlab:16.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.0
+docker pull sameersbn/gitlab:16.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.1
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fd1bd70b7..383210814 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.0
+16.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6d09c1a80..c24990be1 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 616fd42e9..9317e380f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c4cc02167..874adca5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9fd56bbfe..8b9e4381f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.0
+docker pull sameersbn/gitlab:16.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.2.0
+sameersbn/gitlab:16.2.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1bdf8151f..ea890bb90 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ad96eab45..6247c91f6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.0
+    image: sameersbn/gitlab:16.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d8a24cb34..540c59ae9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.2.0
+        image: sameersbn/gitlab:16.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From cc97ed19f0d256fd5571ff23b97ab7bbbca84386 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 4 Aug 2023 18:05:20 +0200
Subject: [PATCH 0878/1124] Upgrade GitLab CE to 16.2.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6ccbe6d30..797974dbf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.2.2**
+
+- gitlab: upgrade CE to v16.2.2
+- gitaly: upgrade to v16.2.2
+- gitlab-pages: upgrade to v16.2.2
+- golang: upgrade to v1.20.7
+- ubuntu: upgrade to focal-20230801
+
 **16.2.1**
 
 - gitlab: upgrade CE to v16.2.1
diff --git a/Dockerfile b/Dockerfile
index f7abcbd65..eacab6850 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230624
+FROM ubuntu:focal-20230801
 
-ARG VERSION=16.2.1
+ARG VERSION=16.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.20.6 \
+    GOLANG_VERSION=1.20.7 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.2.1 \
-    GITALY_SERVER_VERSION=16.2.1 \
+    GITLAB_PAGES_VERSION=16.2.2 \
+    GITALY_SERVER_VERSION=16.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d4f783c5e..07cbe3e90 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.2.1
+# sameersbn/gitlab:16.2.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.1
+docker pull sameersbn/gitlab:16.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.2.1
+ sameersbn/gitlab:16.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.2.1
+    sameersbn/gitlab:16.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:sanitize
+    sameersbn/gitlab:16.2.2 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake db:setup
+    sameersbn/gitlab:16.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.1
+docker pull sameersbn/gitlab:16.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.2
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 383210814..092a0a507 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.1
+16.2.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c24990be1..d6cb6d9a1 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9317e380f..38f80941e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 874adca5a..fd1fbaee0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8b9e4381f..509a7f433 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.1
+docker pull sameersbn/gitlab:16.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.2.1
+sameersbn/gitlab:16.2.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ea890bb90..35b5289b9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6247c91f6..eabac9620 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.1
+    image: sameersbn/gitlab:16.2.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 540c59ae9..f0150ec47 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.2.1
+        image: sameersbn/gitlab:16.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 2c12bd7e30173fbe12686e87096421b659670618 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 5 Aug 2023 09:55:19 +0200
Subject: [PATCH 0879/1124] Upgrade GitLab CE to 16.2.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 797974dbf..deaf74901 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.2.3**
+
+- gitlab: upgrade CE to v16.2.3
+- gitaly: upgrade to v16.2.3
+- gitlab-pages: upgrade to v16.2.3
+
 **16.2.2**
 
 - gitlab: upgrade CE to v16.2.2
diff --git a/Dockerfile b/Dockerfile
index eacab6850..21fc164d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.2.2
+ARG VERSION=16.2.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.20.7 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.2.2 \
-    GITALY_SERVER_VERSION=16.2.2 \
+    GITLAB_PAGES_VERSION=16.2.3 \
+    GITALY_SERVER_VERSION=16.2.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 07cbe3e90..468b22dc9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.2.2
+# sameersbn/gitlab:16.2.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.2
+docker pull sameersbn/gitlab:16.2.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.2.2
+ sameersbn/gitlab:16.2.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.2.2
+    sameersbn/gitlab:16.2.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:sanitize
+    sameersbn/gitlab:16.2.3 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake db:setup
+    sameersbn/gitlab:16.2.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.2.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.2
+docker pull sameersbn/gitlab:16.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.3
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 092a0a507..f4ae2a3b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.2
+16.2.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index d6cb6d9a1..64e77f7ad 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 38f80941e..b786c311c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fd1fbaee0..ee5c8dabe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 509a7f433..414c4d48c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.2
+docker pull sameersbn/gitlab:16.2.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.2.2
+sameersbn/gitlab:16.2.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 35b5289b9..2efa0e4dc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index eabac9620..57fb4903e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.2
+    image: sameersbn/gitlab:16.2.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f0150ec47..6d03aa00a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.2.2
+        image: sameersbn/gitlab:16.2.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 7d8e8affa97fd34e6facacea0bf55b9b61b51a56 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 12 Aug 2023 12:49:10 +0900
Subject: [PATCH 0880/1124] Upgrade nodejs apt source repo from 16.x to 18.x

Required version is updated from v16.15.0 to v18.16.0
with GitLab v16.1.0 release
- "Update required node version to 18.16.0 or later"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106898

Then nodejs v18.16.1 with GitLab v16.2.0
- "Update Node.js to 18.16.1"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124802

And will be updated to v18.17.0 soon
(not released yet, but already merged)
- "Update Node.js to 18.17.0"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127560
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1d86a5d31..df02ab548 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex && \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_16.x focal main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb https://deb.nodesource.com/node_18.x focal main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && set -ex \

From 87fe3890a47351495ce7e7cdd2ad5388bbf46b74 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 12 Aug 2023 10:00:01 +0200
Subject: [PATCH 0881/1124] Upgrade GitLab CE to 16.2.4

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index deaf74901..2edc2d8b7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.2.4**
+
+- gitlab: upgrade CE to v16.2.4
+- gitaly: upgrade to v16.2.4
+- gitlab-pages: upgrade to v16.2.4
+- golang: upgrade to v1.21.0
+
 **16.2.3**
 
 - gitlab: upgrade CE to v16.2.3
diff --git a/Dockerfile b/Dockerfile
index 21fc164d6..1d86a5d31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.2.3
+ARG VERSION=16.2.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.20.7 \
+    GOLANG_VERSION=1.21.0 \
     GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.2.3 \
-    GITALY_SERVER_VERSION=16.2.3 \
+    GITLAB_PAGES_VERSION=16.2.4 \
+    GITALY_SERVER_VERSION=16.2.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 468b22dc9..7cf9e3e9b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.2.3
+# sameersbn/gitlab:16.2.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.3
+docker pull sameersbn/gitlab:16.2.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.2.3
+ sameersbn/gitlab:16.2.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.2.3
+    sameersbn/gitlab:16.2.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:sanitize
+    sameersbn/gitlab:16.2.4 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake db:setup
+    sameersbn/gitlab:16.2.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:env:info
+    sameersbn/gitlab:16.2.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.2.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.3
+docker pull sameersbn/gitlab:16.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.4
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f4ae2a3b3..3ef1174be 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.3
+16.2.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 64e77f7ad..cd2dd3dce 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b786c311c..34a27f1fc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ee5c8dabe..d722fba10 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 414c4d48c..3c4775ed1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.3
+docker pull sameersbn/gitlab:16.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.2.3
+sameersbn/gitlab:16.2.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 2efa0e4dc..ba63f53a5 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 57fb4903e..f0e327dce 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.3
+    image: sameersbn/gitlab:16.2.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6d03aa00a..8e9f130e0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.2.3
+        image: sameersbn/gitlab:16.2.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 8a9c8b6f63a7f4b5d5eb580ea1f062e35f26590b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 22 Aug 2023 21:18:16 +0200
Subject: [PATCH 0882/1124] Upgrade GitLab CE to 16.3.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2edc2d8b7..ddd5c5651 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.3.0**
+
+- gitlab: upgrade CE to v16.3.0
+- gitaly: upgrade to v16.3.0
+- gitlab-pages: upgrade to v16.3.0
+
 **16.2.4**
 
 - gitlab: upgrade CE to v16.2.4
diff --git a/Dockerfile b/Dockerfile
index 1d86a5d31..e565111da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.2.4
+ARG VERSION=16.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.0 \
-    GITLAB_SHELL_VERSION=14.23.0 \
-    GITLAB_PAGES_VERSION=16.2.4 \
-    GITALY_SERVER_VERSION=16.2.4 \
+    GITLAB_SHELL_VERSION=14.26.0 \
+    GITLAB_PAGES_VERSION=16.3.0 \
+    GITALY_SERVER_VERSION=16.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 7cf9e3e9b..0182c51d1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.2.4
+# sameersbn/gitlab:16.3.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.4
+docker pull sameersbn/gitlab:16.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.2.4
+ sameersbn/gitlab:16.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.2.4
+    sameersbn/gitlab:16.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:sanitize
+    sameersbn/gitlab:16.3.0 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake db:setup
+    sameersbn/gitlab:16.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:env:info
+    sameersbn/gitlab:16.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.4
+docker pull sameersbn/gitlab:16.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.0
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3ef1174be..d9a8a3578 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.4
+16.3.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cd2dd3dce..b7d63ddff 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 34a27f1fc..67cb4c81a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d722fba10..fcd81b1e8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3c4775ed1..629cbbadb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.2.4
+docker pull sameersbn/gitlab:16.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.2.4
+sameersbn/gitlab:16.3.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ba63f53a5..21ffe0205 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f0e327dce..2477e4f49 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.2.4
+    image: sameersbn/gitlab:16.3.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8e9f130e0..a9adae1fd 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.2.4
+        image: sameersbn/gitlab:16.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c51770292e1aa8f72ea89fb03eade85fa8ee04ff Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 23 Aug 2023 17:49:33 +0200
Subject: [PATCH 0883/1124] Add temporary patch for lfs object URL

---
 ...condition-for-csr-policy-allow-lfs_v16.3.0.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch

diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch
new file mode 100644
index 000000000..ef82ccff4
--- /dev/null
+++ b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/gitlab/content_security_policy/config_loader.rb b/lib/gitlab/content_security_policy/config_loader.rb
+index 9fb3c7d362f..d012c8b3b7b 100644
+--- a/lib/gitlab/content_security_policy/config_loader.rb
++++ b/lib/gitlab/content_security_policy/config_loader.rb
+@@ -84,7 +84,7 @@ def allow_snowplow_micro(directives)
+         end
+ 
+         def allow_lfs(directives)
+-          return unless Gitlab.config.lfs.enabled && LfsObjectUploader.direct_download_enabled?
++          return unless Gitlab.config.lfs.enabled && Gitlab.config.lfs.object_store.enabled && LfsObjectUploader.direct_download_enabled?
+ 
+           lfs_url = build_lfs_url
+           return unless lfs_url.present?

From 22ab5727ae2529197502d6aa37f5b4eca55dec49 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 2 Sep 2023 07:05:35 +0200
Subject: [PATCH 0884/1124] Upgrade GitLab CE to 16.3.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ddd5c5651..37746c7cf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.3.1**
+
+- gitlab: upgrade CE to v16.3.1
+- gitaly: upgrade to v16.3.1
+- gitlab-pages: upgrade to v16.3.1
+
 **16.3.0**
 
 - gitlab: upgrade CE to v16.3.0
diff --git a/Dockerfile b/Dockerfile
index 7bf8164c6..56b58d009 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.3.0
+ARG VERSION=16.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.0 \
     GITLAB_SHELL_VERSION=14.26.0 \
-    GITLAB_PAGES_VERSION=16.3.0 \
-    GITALY_SERVER_VERSION=16.3.0 \
+    GITLAB_PAGES_VERSION=16.3.1 \
+    GITALY_SERVER_VERSION=16.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0182c51d1..f90a06449 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.3.0
+# sameersbn/gitlab:16.3.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.0
+docker pull sameersbn/gitlab:16.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.3.0
+ sameersbn/gitlab:16.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.3.0
+    sameersbn/gitlab:16.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:sanitize
+    sameersbn/gitlab:16.3.1 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake db:setup
+    sameersbn/gitlab:16.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.0
+docker pull sameersbn/gitlab:16.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.1
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d9a8a3578..32e9db3f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.0
+16.3.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b7d63ddff..cadffbdc3 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 67cb4c81a..f22635dcf 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fcd81b1e8..6df1bc698 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 629cbbadb..00bdb8c41 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.0
+docker pull sameersbn/gitlab:16.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.3.0
+sameersbn/gitlab:16.3.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 21ffe0205..f1a59d111 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2477e4f49..b6b538af0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.0
+    image: sameersbn/gitlab:16.3.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a9adae1fd..c6b1939cb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.3.0
+        image: sameersbn/gitlab:16.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 2fb3680976b5fd74f68112c736fc6751277542dd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 2 Sep 2023 08:28:56 +0200
Subject: [PATCH 0885/1124] Remove temporary patch for lfs object URL (see
 c51770292e)

---
 ...0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename assets/build/patches/{0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch => 0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak} (100%)

diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak
similarity index 100%
rename from assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch
rename to assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak

From f90bafce66ab2e265eb82e250635a34ad58b233a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 7 Sep 2023 20:31:22 +0200
Subject: [PATCH 0886/1124] Upgrade to GitLab CE 16.3.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 37746c7cf..b9c2b3381 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.3.2**
+
+- gitlab: upgrade CE to v16.3.2
+- gitaly: upgrade to v16.3.2
+- gitlab-pages: upgrade to v16.3.2
+- golang: upgrade to v1.21.1
+
 **16.3.1**
 
 - gitlab: upgrade CE to v16.3.1
diff --git a/Dockerfile b/Dockerfile
index 56b58d009..d93e53abb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.3.1
+ARG VERSION=16.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.21.0 \
+    GOLANG_VERSION=1.21.1 \
     GITLAB_SHELL_VERSION=14.26.0 \
-    GITLAB_PAGES_VERSION=16.3.1 \
-    GITALY_SERVER_VERSION=16.3.1 \
+    GITLAB_PAGES_VERSION=16.3.2 \
+    GITALY_SERVER_VERSION=16.3.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f90a06449..bf015b482 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.3.1
+# sameersbn/gitlab:16.3.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.1
+docker pull sameersbn/gitlab:16.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.3.1
+ sameersbn/gitlab:16.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.3.1
+    sameersbn/gitlab:16.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:sanitize
+    sameersbn/gitlab:16.3.2 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake db:setup
+    sameersbn/gitlab:16.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.1
+docker pull sameersbn/gitlab:16.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.2
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 32e9db3f9..b10c7dda7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.1
+16.3.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cadffbdc3..5cd2fa1cf 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f22635dcf..e03b3ecd8 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6df1bc698..cdc643d28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 00bdb8c41..7afd7aa88 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.1
+docker pull sameersbn/gitlab:16.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.3.1
+sameersbn/gitlab:16.3.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f1a59d111..6fa91890a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b6b538af0..91ae62be0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.1
+    image: sameersbn/gitlab:16.3.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c6b1939cb..ac4d6a47d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.3.1
+        image: sameersbn/gitlab:16.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 25f5a93ac5b8983671cad7004555f84ed3479a20 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 13 Sep 2023 06:59:15 +0200
Subject: [PATCH 0887/1124] Upgrade to GitLab CE 16.3.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b9c2b3381..7b208d2d1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.3.3**
+
+- gitlab: upgrade CE to v16.3.3
+- gitaly: upgrade to v16.3.3
+- gitlab-pages: upgrade to v16.3.3
+
 **16.3.2**
 
 - gitlab: upgrade CE to v16.3.2
diff --git a/Dockerfile b/Dockerfile
index d93e53abb..435e18916 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.3.2
+ARG VERSION=16.3.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.1 \
     GITLAB_SHELL_VERSION=14.26.0 \
-    GITLAB_PAGES_VERSION=16.3.2 \
-    GITALY_SERVER_VERSION=16.3.2 \
+    GITLAB_PAGES_VERSION=16.3.3 \
+    GITALY_SERVER_VERSION=16.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bf015b482..61d23b726 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.3.2
+# sameersbn/gitlab:16.3.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.2
+docker pull sameersbn/gitlab:16.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.3.2
+ sameersbn/gitlab:16.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.3.2
+    sameersbn/gitlab:16.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:sanitize
+    sameersbn/gitlab:16.3.3 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake db:setup
+    sameersbn/gitlab:16.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.2
+docker pull sameersbn/gitlab:16.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.3
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b10c7dda7..1dd56bff6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.2
+16.3.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5cd2fa1cf..5a37eee27 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e03b3ecd8..1ea90008d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cdc643d28..7461dabdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7afd7aa88..b8c86c040 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.2
+docker pull sameersbn/gitlab:16.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.3.2
+sameersbn/gitlab:16.3.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6fa91890a..28977b05a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 91ae62be0..c619c80e8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.2
+    image: sameersbn/gitlab:16.3.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ac4d6a47d..7659b72eb 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.3.2
+        image: sameersbn/gitlab:16.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From f742f4d151510217c8ce6ee088877b57d206877f Mon Sep 17 00:00:00 2001
From: Patrick Remy <remy@divera.gmbh>
Date: Tue, 19 Sep 2023 09:45:42 +0200
Subject: [PATCH 0888/1124] Upgrade to GitLab CE 16.3.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7b208d2d1..14884deca 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.3.4**
+
+- gitlab: upgrade CE to v16.3.4
+- gitaly: upgrade to v16.3.4
+- gitlab-pages: upgrade to v16.3.4
+
 **16.3.3**
 
 - gitlab: upgrade CE to v16.3.3
diff --git a/Dockerfile b/Dockerfile
index 435e18916..c71fed951 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.3.3
+ARG VERSION=16.3.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.1 \
     GITLAB_SHELL_VERSION=14.26.0 \
-    GITLAB_PAGES_VERSION=16.3.3 \
-    GITALY_SERVER_VERSION=16.3.3 \
+    GITLAB_PAGES_VERSION=16.3.4 \
+    GITALY_SERVER_VERSION=16.3.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 61d23b726..77d0a9e8f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.3.3
+# sameersbn/gitlab:16.3.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.3
+docker pull sameersbn/gitlab:16.3.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.3.3
+ sameersbn/gitlab:16.3.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.3.3
+    sameersbn/gitlab:16.3.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:sanitize
+    sameersbn/gitlab:16.3.4 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake db:setup
+    sameersbn/gitlab:16.3.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:16.3.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.3
+docker pull sameersbn/gitlab:16.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.4
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1dd56bff6..abd15e762 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.3
+16.3.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5a37eee27..6549c5a1e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1ea90008d..4f805e204 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7461dabdf..051b6b2f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b8c86c040..d5a49f8d4 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.3
+docker pull sameersbn/gitlab:16.3.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.3.3
+sameersbn/gitlab:16.3.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 28977b05a..886596977 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c619c80e8..f9f809ee0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.3
+    image: sameersbn/gitlab:16.3.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7659b72eb..330b4c06b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.3.3
+        image: sameersbn/gitlab:16.3.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 8c1c480265641d2aa32063ad54af8f5fbf10d993 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 28 Sep 2023 20:13:36 +0200
Subject: [PATCH 0889/1124] Upgrade to GitLab CE 16.4.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 14884deca..55392f8e0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.4.0**
+
+- gitlab: upgrade CE to v16.4.0
+- gitaly: upgrade to v16.4.0
+- gitlab-pages: upgrade to v16.4.0
+- gitlab-shell: upgrade to v14.28.0
+
 **16.3.4**
 
 - gitlab: upgrade CE to v16.3.4
diff --git a/Dockerfile b/Dockerfile
index c71fed951..1aa75eda2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.3.4
+ARG VERSION=16.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.1 \
-    GITLAB_SHELL_VERSION=14.26.0 \
-    GITLAB_PAGES_VERSION=16.3.4 \
-    GITALY_SERVER_VERSION=16.3.4 \
+    GITLAB_SHELL_VERSION=14.28.0 \
+    GITLAB_PAGES_VERSION=16.4.0 \
+    GITALY_SERVER_VERSION=16.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 77d0a9e8f..816807c8e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.3.4
+# sameersbn/gitlab:16.4.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.4
+docker pull sameersbn/gitlab:16.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.3.4
+ sameersbn/gitlab:16.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.3.4
+    sameersbn/gitlab:16.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:sanitize
+    sameersbn/gitlab:16.4.0 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake db:setup
+    sameersbn/gitlab:16.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:env:info
+    sameersbn/gitlab:16.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.3.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.4
+docker pull sameersbn/gitlab:16.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.0
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index abd15e762..29b7b9ad9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.3.4
+16.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6549c5a1e..98627a143 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4f805e204..9b775a50a 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 051b6b2f8..ae3456abb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d5a49f8d4..d38902a0a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.3.4
+docker pull sameersbn/gitlab:16.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.3.4
+sameersbn/gitlab:16.4.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 886596977..b84a00a34 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f9f809ee0..48779507f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.3.4
+    image: sameersbn/gitlab:16.4.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 330b4c06b..8ec44443b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.3.4
+        image: sameersbn/gitlab:16.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 02d95f14316a784b4080ef98ac25e5d8d80eb9d1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 30 Sep 2023 17:35:02 +0200
Subject: [PATCH 0890/1124] Upgrade to GitLab CE 16.4.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 55392f8e0..400fc865e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.4.1**
+
+- gitlab: upgrade CE to v16.4.1
+- gitaly: upgrade to v16.4.1
+- gitlab-pages: upgrade to v16.4.1
+
 **16.4.0**
 
 - gitlab: upgrade CE to v16.4.0
diff --git a/Dockerfile b/Dockerfile
index 1aa75eda2..cfc0174d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20230801
 
-ARG VERSION=16.4.0
+ARG VERSION=16.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.1 \
     GITLAB_SHELL_VERSION=14.28.0 \
-    GITLAB_PAGES_VERSION=16.4.0 \
-    GITALY_SERVER_VERSION=16.4.0 \
+    GITLAB_PAGES_VERSION=16.4.1 \
+    GITALY_SERVER_VERSION=16.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 816807c8e..8e4578ef2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.4.0
+# sameersbn/gitlab:16.4.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.0
+docker pull sameersbn/gitlab:16.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.4.0
+ sameersbn/gitlab:16.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.4.0
+    sameersbn/gitlab:16.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:sanitize
+    sameersbn/gitlab:16.4.1 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake db:setup
+    sameersbn/gitlab:16.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.0
+docker pull sameersbn/gitlab:16.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.1
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 29b7b9ad9..0baffb7e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.4.0
+16.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 98627a143..62fcd6c94 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9b775a50a..4ffefe945 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ae3456abb..8f34ed567 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d38902a0a..26210ec99 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.0
+docker pull sameersbn/gitlab:16.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.4.0
+sameersbn/gitlab:16.4.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b84a00a34..9450d6ba1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 48779507f..5de6f51da 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.0
+    image: sameersbn/gitlab:16.4.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8ec44443b..6e892f3c3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.4.0
+        image: sameersbn/gitlab:16.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From c8bc43b9142fb817fb63cc388fb7af7cdf876f83 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:40:45 -0400
Subject: [PATCH 0891/1124] Added missing label and scope variable field.

---
 assets/runtime/config/gitlabhq/gitlab.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 49502277e..cdb7a8055 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1017,6 +1017,8 @@ production: &base
               email: '{{OAUTH2_GENERIC_USER_EMAIL}}'
               }
             },
+            authorize_params: { scope: "{{OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE}}" },
+            label: '{{OAUTH2_GENERIC_LABEL}}',
             name: '{{OAUTH2_GENERIC_NAME}}' }}
       - { name: 'azure_oauth2',
           args: {

From af693c5ecc09f0ae02924ec6b8b51938e1eab177 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:44:28 -0400
Subject: [PATCH 0892/1124] Update env-defaults

---
 assets/runtime/env-defaults | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index deab8a2a8..e13db5fe6 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -531,6 +531,8 @@ OAUTH2_GENERIC_ID_PATH=${OAUTH2_GENERIC_ID_PATH:-}
 OAUTH2_GENERIC_USER_UID=${OAUTH2_GENERIC_USER_UID:-}
 OAUTH2_GENERIC_USER_NAME=${OAUTH2_GENERIC_USER_NAME:-}
 OAUTH2_GENERIC_USER_EMAIL=${OAUTH2_GENERIC_USER_EMAIL:-}
+OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=${OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE:-}
+OAUTH2_GENERIC_LABEL=${OAUTH2_GENERIC_LABEL:-}
 OAUTH2_GENERIC_NAME=${OAUTH2_GENERIC_NAME:-}
 
 ## ANALYTICS

From a903d9829066671b8384d66c564b53251233a05e Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:45:02 -0400
Subject: [PATCH 0893/1124] Update functions

---
 assets/runtime/functions | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 496a28e0c..7febb24cb 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -722,6 +722,8 @@ gitlab_configure_oauth2_generic() {
     OAUTH2_GENERIC_USER_UID \
     OAUTH2_GENERIC_USER_NAME \
     OAUTH2_GENERIC_USER_EMAIL \
+    OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE \
+    OAUTH2_GENERIC_LABEL \
     OAUTH2_GENERIC_NAME
   else
       exec_as_git sed -i "/name: 'oauth2_generic'/,/{{OAUTH2_GENERIC_NAME}}/d" ${GITLAB_CONFIG}

From fa75409aff25ccf4371e6e83b8857272c2f2aff6 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:48:54 -0400
Subject: [PATCH 0894/1124] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e4578ef2..ff5d89dbd 100644
--- a/README.md
+++ b/README.md
@@ -718,7 +718,7 @@ Also you can configure v2 endpoint (`azure_activedirectory_v2`) by using `OAUTH_
 
 To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure.
 
-As an example this code has been tested with Keycloak, with the following variables: `OAUTH2_GENERIC_APP_ID`, `OAUTH2_GENERIC_APP_SECRET`, `OAUTH2_GENERIC_CLIENT_SITE`, `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`, `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`, `OAUTH2_GENERIC_CLIENT_TOKEN_URL`, `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`, `OAUTH2_GENERIC_ID_PATH`, `OAUTH2_GENERIC_USER_UID`, `OAUTH2_GENERIC_USER_NAME`, `OAUTH2_GENERIC_USER_EMAIL`, `OAUTH2_GENERIC_NAME`,
+As an example this code has been tested with Keycloak, with the following variables: `OAUTH2_GENERIC_APP_ID`, `OAUTH2_GENERIC_APP_SECRET`, `OAUTH2_GENERIC_CLIENT_SITE`, `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`, `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`, `OAUTH2_GENERIC_CLIENT_TOKEN_URL`, `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`, `OAUTH2_GENERIC_ID_PATH`, `OAUTH2_GENERIC_USER_UID`, `OAUTH2_GENERIC_USER_NAME`, `OAUTH2_GENERIC_USER_EMAIL`, `OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE`, `OAUTH2_GENERIC_LABEL` and `OAUTH2_GENERIC_NAME`.
 
 See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details.
 

From ab0e2e63f8d177e44d1de0d0bd3b1f0cd5ae6a01 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:49:47 -0400
Subject: [PATCH 0895/1124] Update docker-compose.yml

---
 contrib/docker-swarm/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 62fcd6c94..38145e481 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -163,6 +163,8 @@ services:
     - OAUTH2_GENERIC_USER_UID=
     - OAUTH2_GENERIC_USER_NAME=
     - OAUTH2_GENERIC_USER_EMAIL=
+    - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=
+    - OAUTH2_GENERIC_LABEL=
     - OAUTH2_GENERIC_NAME=
 
     - OAUTH_AZURE_API_KEY=

From 964e29c92dd9b28aa50a3c7a56826eb624941ee2 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Sun, 1 Oct 2023 13:55:50 -0400
Subject: [PATCH 0896/1124] Fix tipo.

---
 docs/keycloak-idp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 149e639cb..8a5b9ad37 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -42,7 +42,7 @@ Set the following in the docker-compose file:
 The following must also be configured:
 
 ```yaml
-    - OAUTH2_GENERIC_USER_UID='preffered_usename'
+    - OAUTH2_GENERIC_USER_UID='prefered_username'
     - OAUTH2_GENERIC_USER_NAME='name'
     - OAUTH2_GENERIC_USER_EMAIL='email'    
 ```

From 8bcb068cacfc6b29828d09795c9e9d9492bcc8c3 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Mon, 2 Oct 2023 09:00:08 -0400
Subject: [PATCH 0897/1124] Update README.md

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index ff5d89dbd..15c4df893 100644
--- a/README.md
+++ b/README.md
@@ -2279,6 +2279,14 @@ The OAuth2 generic user name. No defaults
 
 The OAuth2 generic user email. No defaults
 
+##### `OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE`
+
+The scope of your OAuth2 provider. No defaults
+
+##### `OAUTH2_GENERIC_LABEL`
+
+The label of your OAuth2 provider. No defaults
+
 ##### `OAUTH2_GENERIC_NAME`
 
 The name of your OAuth2 provider. No defaults

From 755a9ac8f97190fb48b4f10cb2020c8745c03b77 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Mon, 2 Oct 2023 09:28:54 -0400
Subject: [PATCH 0898/1124] Update docs/keycloak-idp.md

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 docs/keycloak-idp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 8a5b9ad37..b3aff53c3 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -42,7 +42,7 @@ Set the following in the docker-compose file:
 The following must also be configured:
 
 ```yaml
-    - OAUTH2_GENERIC_USER_UID='prefered_username'
+    - OAUTH2_GENERIC_USER_UID='preferred_username'
     - OAUTH2_GENERIC_USER_NAME='name'
     - OAUTH2_GENERIC_USER_EMAIL='email'    
 ```

From a2dd4e5ed8fac3e059c4d15845895fd68c5b66e9 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 27 Sep 2023 19:15:03 +0900
Subject: [PATCH 0899/1124] Accept multiple hosts for RACK_ATTACK_WHITELIST

see sameersbn/docker-gitlab#2828

The current setup also accepts multiple hosts,
but the syntax is a bit strange.
The leading/trailing double quotes are embedded
in the configuration file itself,
so users should expect double quotes around the string they set.
In other words, when setting two hosts 0.0.0.0 and 1.1.1.1,
you will set the strings 0.0.0.0","1.1.1.1 in the
environment variables. This is not intuitive.

This commit removes double quote around corresponding config
and set backward compatibility fallback process
to surround whole with [], each host with double quote.
Also, validation script (written in ruby) will be executed during configuration.

Example docker-compose.yml
````yaml
services:
  gitlab:
    image: sameersbn/gitlab:latest
    environment:
    - RACK_ATTACK_WHITELIST='["127.0.0.1","0.0.0.0"]'
````

Co-authored-by: Mikhail Khadarenka <chodorenko@mail.ru>
---
 README.md                                 | 14 +++++++++++-
 assets/runtime/config/gitlabhq/gitlab.yml |  2 +-
 assets/runtime/env-defaults               | 26 ++++++++++++++++++++++-
 assets/runtime/functions                  | 18 ++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8e4578ef2..bf1099cf3 100644
--- a/README.md
+++ b/README.md
@@ -2381,7 +2381,19 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul
 
 ##### `RACK_ATTACK_WHITELIST`
 
-Always allow requests from whitelisted host. Defaults to `127.0.0.1`
+Always allow requests from whitelisted host.   
+This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail.  
+If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below:
+
+````yaml
+environment:
+# pattern 1: surround with single quote, double quote each IP address
+- RACK_ATTACK_WHITELIST='["1.1.1.1","192.168.0.0/24"]'
+# pattern 2: surround with double quote, single quote each IP address
+- RACK_ATTACK_WHITELIST="['1.1.1.1','192.168.0.0/24']"
+````
+
+Defaults to `["127.0.0.1"]`
 
 ##### `RACK_ATTACK_MAXRETRY`
 
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 49502277e..5754ad3c2 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1231,7 +1231,7 @@ production: &base
       enabled: {{RACK_ATTACK_ENABLED}}
       #
       # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers
-      ip_whitelist: ["{{RACK_ATTACK_WHITELIST}}"]
+      ip_whitelist: {{RACK_ATTACK_WHITELIST}}
       #
       # Limit the number of Git HTTP authentication attempts per IP
       maxretry: {{RACK_ATTACK_MAXRETRY}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index deab8a2a8..f29734902 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -544,7 +544,31 @@ PIWIK_SITE_ID=${PIWIK_SITE_ID:-}
 
 ## RACK ATTACK
 RACK_ATTACK_ENABLED=${RACK_ATTACK_ENABLED:-true}
-RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST:-"127.0.0.1"}
+RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST:-'["127.0.0.1"]'}
+RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST// /}
+# Backward compatibility : See sameersbn/docker-gitlab#2828
+# Pre-check: each host is surrounded by single / double quotation
+# if not, generated string will be [127.0.0.1] for example and ruby raises error
+RACK_ATTACK_WHITELIST_ORIGIN=${RACK_ATTACK_WHITELIST}
+# remove [], then iterate entries
+RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST#"["}
+RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST%"]"}
+IFS_ORG=${IFS}
+IFS=,
+for host in ${RACK_ATTACK_WHITELIST}; do
+  # Both single / double quotation may be used
+  if ! [[ ${host} =~ ^(\"|\').*(\"|\')$ ]]; then
+    RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST/${host}/\"${host//(\'|\")/}\"}
+  fi
+done
+IFS=$IFS_ORG
+# surround with []
+RACK_ATTACK_WHITELIST="[${RACK_ATTACK_WHITELIST}]"
+if [[ "${RACK_ATTACK_WHITELIST}" != "${RACK_ATTACK_WHITELIST_ORIGIN}" ]]; then
+  printf "[warning] RACK_ATTACK_WHITELIST must be a yaml sequence of hosts.\nFixing from %s to %s\n" \
+    "${RACK_ATTACK_WHITELIST_ORIGIN}" \
+    "${RACK_ATTACK_WHITELIST}"
+fi
 RACK_ATTACK_MAXRETRY=${RACK_ATTACK_MAXRETRY:-10}
 RACK_ATTACK_FINDTIME=${RACK_ATTACK_FINDTIME:-60}
 RACK_ATTACK_BANTIME=${RACK_ATTACK_BANTIME:-3600}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 496a28e0c..a1607e2af 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1068,6 +1068,24 @@ gitlab_configure_analytics() {
 
 gitlab_configure_rack_attack() {
   echo "Configuring gitlab::rack_attack..."
+
+  # validity check : RACK_ATTACK_WHITELIST should be an array of valid IP Address string
+  echo " Validating RACK_ATTACK_WHITELIST..."
+  /usr/bin/env ruby << SCRIPT
+  require 'ipaddr'
+  ${RACK_ATTACK_WHITELIST}.each do |host|
+    begin
+      printf("  input=%s, to_range=%s\n", host, IPAddr.new(host).to_range)
+    rescue IPAddr::InvalidAddressError => e
+      p e
+      exit 1
+    rescue => e
+      put "Unexpected error", e
+      exit 1
+    end
+  end
+SCRIPT
+
   update_template ${GITLAB_CONFIG} \
     RACK_ATTACK_ENABLED \
     RACK_ATTACK_WHITELIST \

From da0d78bf5b5c2d228e6868bad5dc0dc7ca7717dd Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 2 Oct 2023 18:34:45 +0900
Subject: [PATCH 0900/1124] Add build patch to avoid removing node_modules

note: Only affected if using the relative_url feature

`gitlab/script/frontent/preinstall.mjs` is introduced since v16.4.0.
This script is executed on container startup, if using the relative url.
This script removes `NODE_MODULES` (/home/git/gitlab/node_modules) when
"the folder seems to end up being a corrupted somehow"
See more detail:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130938

On sameersbn/gitlab, the folder node_modules is declared as volume.
The volume is always busy so that cannot be removed in the container.
You can see following error reported on container startup
(sameersbn/gitlab:16.4.0 or later).

````
yarn install v1.22.19
$ node ./scripts/frontend/preinstall.mjs
[WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems. node:internal/process/esm_loader:97
    internalBinding('errors').triggerUncaughtException(
                              ^

[Error: EBUSY: resource busy or locked, rmdir '/home/git/gitlab/node_modules'] {
  errno: -16,
  code: 'EBUSY',
  syscall: 'rmdir',
  path: '/home/git/gitlab/node_modules'
}

Node.js v18.17.1
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. -----
````

This PR add a build time patch to change the behavior of
script/frontend/preinstall.mjs to not to remove node_modules directly,
but empty it instead.
---
 ...s-to-avoid-removing-node_modules_dir.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch

diff --git a/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
new file mode 100644
index 000000000..a5646ff38
--- /dev/null
+++ b/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
@@ -0,0 +1,28 @@
+diff --git a/scripts/frontend/preinstall.mjs b/scripts/frontend/preinstall.mjs
+index 09d980344eac..b1514e803b75 100644
+--- a/scripts/frontend/preinstall.mjs
++++ b/scripts/frontend/preinstall.mjs
+@@ -1,6 +1,6 @@
+ import { dirname, join } from 'node:path';
+ import { fileURLToPath } from 'node:url';
+-import { readFile, rm } from 'node:fs/promises';
++import { readdir, readFile, rm, stat } from 'node:fs/promises';
+ 
+ const ROOT_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
+ const NODE_MODULES = join(ROOT_PATH, 'node_modules');
+@@ -55,5 +55,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) {
+   console.error(
+     '[WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems.',
+   );
+-  await rm(NODE_MODULES, { recursive: true, force: true });
++  // sameersbn/gitlab : avoid removing NODE_MODULES directly, iterate its content instead
++  // The path NODE_MODULES is declared as docker volume - always busy so that cannot be removed
++  // before iterating, check if the directory exists
++  const isDirectory = await stat(NODE_MODULES).then((stat) => stat.isDirectory()).catch(() => false);
++  if(isDirectory) {
++      for (const dir_ent of await readdir(NODE_MODULES, { withFileTypes: true})) {
++      const to_remove = join(NODE_MODULES, dir_ent.name);
++      await rm(to_remove, { recursive: true, force: true });
++    }
++  }
+ }

From 43d0a969d158f83186a7da2e9ea63a7f278a4370 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 23 Oct 2023 00:36:46 +0200
Subject: [PATCH 0901/1124] Upgrade to GitLab CE 16.5.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 400fc865e..8ff91af83 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,15 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.5.0**
+
+- gitlab: upgrade CE to v16.5.0
+- gitaly: upgrade to v16.5.0
+- gitlab-pages: upgrade to v16.5.0
+- gitlab-shell: upgrade to v14.29.0
+- golang: upgrade to v1.21.3
+- ubuntu: upgrade to focal-20231003
+
 **16.4.1**
 
 - gitlab: upgrade CE to v16.4.1
diff --git a/Dockerfile b/Dockerfile
index cfc0174d8..ed3197673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20230801
+FROM ubuntu:focal-20231003
 
-ARG VERSION=16.4.1
+ARG VERSION=16.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.21.1 \
-    GITLAB_SHELL_VERSION=14.28.0 \
-    GITLAB_PAGES_VERSION=16.4.1 \
-    GITALY_SERVER_VERSION=16.4.1 \
+    GOLANG_VERSION=1.21.3 \
+    GITLAB_SHELL_VERSION=14.29.0 \
+    GITLAB_PAGES_VERSION=16.5.0 \
+    GITALY_SERVER_VERSION=16.5.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8e4578ef2..b36983a9f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.4.1
+# sameersbn/gitlab:16.5.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.1
+docker pull sameersbn/gitlab:16.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.4.1
+ sameersbn/gitlab:16.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.4.1
+    sameersbn/gitlab:16.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:sanitize
+    sameersbn/gitlab:16.5.0 app:sanitize
 ```
 
 #### Piwik
@@ -2448,7 +2448,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2483,14 +2483,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake db:setup
+    sameersbn/gitlab:16.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2548,7 +2548,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.1
+docker pull sameersbn/gitlab:16.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2646,7 +2646,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.0
 ```
 
 ### Shell Access
@@ -2684,7 +2684,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0baffb7e2..28ebe8b4d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.4.1
+16.5.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 62fcd6c94..9e35870c7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4ffefe945..eb1cf2cd7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f34ed567..82258b288 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 26210ec99..a507c0d4d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.4.1
+docker pull sameersbn/gitlab:16.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.4.1
+sameersbn/gitlab:16.5.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9450d6ba1..101053f4c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 5de6f51da..6c9a026c6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.4.1
+    image: sameersbn/gitlab:16.5.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6e892f3c3..2e570ecb7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.4.1
+        image: sameersbn/gitlab:16.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d11ae7b617d429b7867fc32b03959d259eb1f95f Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Mon, 23 Oct 2023 22:17:20 -0400
Subject: [PATCH 0902/1124] Added missing configuration variable
 OAUTH_ALLOW_BYPASS_TWO_FACTOR.

---
 README.md                                 | 4 ++++
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 assets/runtime/env-defaults               | 1 +
 assets/runtime/functions                  | 3 ++-
 contrib/docker-swarm/docker-compose.yml   | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e7479d617..bb3ac5cc5 100644
--- a/README.md
+++ b/README.md
@@ -2023,6 +2023,10 @@ Allow users with existing accounts to login and auto link their account via the
 
 Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default.
 
+##### `OAUTH_ALLOW_BYPASS_TWO_FACTOR`
+
+Comma separated list of oauth providers where users can sign in without using two-factor authentication (2FA). Defaults to `[]`.
+
 ##### `OAUTH_CAS3_LABEL`
 
 The "Sign in with" button label. Defaults to "cas3".
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 35d4e4db0..04a220cdb 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -918,7 +918,7 @@ production: &base
     # This option should only be configured for providers which already have two factor.
     # This configration dose not apply to SAML.
     # (default: false)
-    allow_bypass_two_factor: null
+    allow_bypass_two_factor: [{{OAUTH_ALLOW_BYPASS_TWO_FACTOR}}]
 
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index fe49d61f1..6f4e4a734 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -426,6 +426,7 @@ OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true}
 OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
 OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false}
 OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS:-}
+OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-}
 
 ### GOOGLE
 OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 9deaa2fc1..8efd0a237 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -819,7 +819,8 @@ gitlab_configure_oauth() {
     OAUTH_AUTO_LINK_LDAP_USER \
     OAUTH_AUTO_LINK_SAML_USER \
     OAUTH_AUTO_LINK_USER \
-    OAUTH_EXTERNAL_PROVIDERS
+    OAUTH_EXTERNAL_PROVIDERS \
+    OAUTH_ALLOW_BYPASS_TWO_FACTOR
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
     cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME)
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 38145e481..28512b693 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -99,6 +99,7 @@ services:
     - OAUTH_AUTO_LINK_LDAP_USER=false
     - OAUTH_AUTO_LINK_SAML_USER=false
     - OAUTH_EXTERNAL_PROVIDERS=
+    - OAUTH_ALLOW_BYPASS_TWO_FACTOR=
 
     - OAUTH_CAS3_LABEL=cas3
     - OAUTH_CAS3_SERVER=

From 6021919e32368ec9a78f1e742606f489b708dc04 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Tue, 24 Oct 2023 08:21:28 -0400
Subject: [PATCH 0903/1124] Update docker-compose.yml

---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 28512b693..9fa1f6d72 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -99,7 +99,7 @@ services:
     - OAUTH_AUTO_LINK_LDAP_USER=false
     - OAUTH_AUTO_LINK_SAML_USER=false
     - OAUTH_EXTERNAL_PROVIDERS=
-    - OAUTH_ALLOW_BYPASS_TWO_FACTOR=
+    - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false
 
     - OAUTH_CAS3_LABEL=cas3
     - OAUTH_CAS3_SERVER=

From 00011258590c681d853aa6e2505175d1bc005d53 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Tue, 24 Oct 2023 08:22:08 -0400
Subject: [PATCH 0904/1124] Update env-defaults

---
 assets/runtime/env-defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 6f4e4a734..4c0a529f2 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -426,7 +426,7 @@ OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true}
 OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false}
 OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false}
 OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS:-}
-OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-}
+OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-false}
 
 ### GOOGLE
 OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY:-}

From 9500ad163bbb4f80b8695ed34e48173f71f85e56 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Tue, 24 Oct 2023 08:23:00 -0400
Subject: [PATCH 0905/1124] Update README.md

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb3ac5cc5..965e5a604 100644
--- a/README.md
+++ b/README.md
@@ -2025,7 +2025,7 @@ Comma separated list if oauth providers to disallow access to `internal` project
 
 ##### `OAUTH_ALLOW_BYPASS_TWO_FACTOR`
 
-Comma separated list of oauth providers where users can sign in without using two-factor authentication (2FA). Defaults to `[]`.
+Specify oauth providers where users can sign in without using two-factor authentication (2FA). You can define this using an array of providers like `["twitter", "google_oauth2"]`. Setting this to `true` or `false` applies to all - allow all or none. Defaults to `false`.
 
 ##### `OAUTH_CAS3_LABEL`
 

From e574613c9e130f6628f717f362288e82ce0e5ef7 Mon Sep 17 00:00:00 2001
From: massej <jonathan.j.masse@usherbrooke.ca>
Date: Tue, 24 Oct 2023 08:23:11 -0400
Subject: [PATCH 0906/1124] Update assets/runtime/config/gitlabhq/gitlab.yml

Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
---
 assets/runtime/config/gitlabhq/gitlab.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 04a220cdb..226ced2e8 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -918,7 +918,7 @@ production: &base
     # This option should only be configured for providers which already have two factor.
     # This configration dose not apply to SAML.
     # (default: false)
-    allow_bypass_two_factor: [{{OAUTH_ALLOW_BYPASS_TWO_FACTOR}}]
+    allow_bypass_two_factor: {{OAUTH_ALLOW_BYPASS_TWO_FACTOR}}
 
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use

From bac9b4f876ee5e034a30878d1894f591278dab71 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 3 Nov 2023 22:16:56 +0100
Subject: [PATCH 0907/1124] Upgrade to GitLab CE 16.5.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8ff91af83..5ad398335 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.5.1**
+
+- gitlab: upgrade CE to v16.5.1
+- gitaly: upgrade to v16.5.1
+- gitlab-pages: upgrade to v16.5.1
+
 **16.5.0**
 
 - gitlab: upgrade CE to v16.5.0
diff --git a/Dockerfile b/Dockerfile
index ed3197673..294171370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231003
 
-ARG VERSION=16.5.0
+ARG VERSION=16.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.3 \
     GITLAB_SHELL_VERSION=14.29.0 \
-    GITLAB_PAGES_VERSION=16.5.0 \
-    GITALY_SERVER_VERSION=16.5.0 \
+    GITLAB_PAGES_VERSION=16.5.1 \
+    GITALY_SERVER_VERSION=16.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5951d0f12..b79091f5c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.5.0
+# sameersbn/gitlab:16.5.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.0
+docker pull sameersbn/gitlab:16.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.5.0
+ sameersbn/gitlab:16.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.5.0
+    sameersbn/gitlab:16.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:sanitize
+    sameersbn/gitlab:16.5.1 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake db:setup
+    sameersbn/gitlab:16.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.0
+docker pull sameersbn/gitlab:16.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.1
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 28ebe8b4d..773e5b01b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.5.0
+16.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 3ae23ee6c..b1bcfc713 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index eb1cf2cd7..5b3805e3d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 82258b288..d88e88957 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a507c0d4d..50b195c12 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.0
+docker pull sameersbn/gitlab:16.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.5.0
+sameersbn/gitlab:16.5.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 101053f4c..165a525bc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6c9a026c6..1a78bf861 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.0
+    image: sameersbn/gitlab:16.5.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2e570ecb7..e325d3324 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.5.0
+        image: sameersbn/gitlab:16.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From c814fb7ac9e28152a00e1a1151e0f93748fbec70 Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Sat, 4 Nov 2023 13:26:54 +0000
Subject: [PATCH 0908/1124] Upgrade instructions form Postgresql 12 to 14

Postgres 15 has a permissions problem.
See https://github.com/sameersbn/docker-postgresql/issues/168
---
 .circleci/config.yml                    |  3 +++
 README.md                               | 14 +++++++-------
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/postgresql-rc.yml            |  2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2e2676f6..d7154f9d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,6 +231,9 @@ jobs:
       - run:
           name: Wait for stack bootup
           command: sleep 90
+      - run:
+          name: Show logs
+          command: docker-compose logs
       - run:
           name: Test image bootup
           command: |
diff --git a/README.md b/README.md
index b79091f5c..779abded0 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm,btree_gist' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:12-20200524
+    sameersbn/postgresql:14-20230628
 ```
 
 Step 2. Launch a redis container
@@ -236,7 +236,7 @@ docker run --name gitlab -d \
 
 GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL.
 
-*Note:* GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL
+*Note:* GitLab requires PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL
 
 #### PostgreSQL
 
@@ -263,7 +263,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - `postgresql-client-14`,
 - and `postgresql-client-15`.
 
-*NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x
+*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x
 
 ##### External PostgreSQL Server
 
@@ -301,7 +301,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, lets pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:12-20200524
+docker pull sameersbn/postgresql:14-20230628
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -321,7 +321,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:12-20200524
+    sameersbn/postgresql:14-20230628
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -2630,9 +2630,9 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8>).
+> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
 >
-> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
+> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b1bcfc713..40dd50319 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:14-20230628
     volumes:
     - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 5b3805e3d..e89b57b08 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:14-20230628
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index d88e88957..22294623b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:14-20230628
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 165a525bc..461d4de52 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:14-20230628
     volumes:
     - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1a78bf861..895bf903b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:12-20200524
+    image: sameersbn/postgresql:14-20230628
     volumes:
     - postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index dee508791..9498d28b0 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:12-20200524
+        image: sameersbn/postgresql:14-20230628
         env:
         - name: DB_USER
           value: gitlab

From 51cc21dfc8cbc1173476a5f3ec68a3d193511829 Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Thu, 9 Nov 2023 13:53:04 +0000
Subject: [PATCH 0909/1124] Bump orb to circleci/docker@2.4.0

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7154f9d8..4bafdaecf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   shellcheck: circleci/shellcheck@3.1.1
-  docker: circleci/docker@2.1.1
+  docker: circleci/docker@2.4.0
   go: circleci/go@1.7.1
 
 commands:

From d37154d59fe2b5387f1d742598f5c7d3188ce62a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 19 Nov 2023 13:57:56 +0100
Subject: [PATCH 0910/1124] Upgrade to GitLab CE 16.6.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5ad398335..581bf4699 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.6.0**
+
+- gitlab: upgrade CE to v16.6.0
+- gitaly: upgrade to v16.6.0
+- gitlab-pages: upgrade to v16.6.0
+- gitlab-shell: upgrade to v14.30.0
+- golang: upgrade to v1.21.4
+
 **16.5.1**
 
 - gitlab: upgrade CE to v16.5.1
diff --git a/Dockerfile b/Dockerfile
index 294171370..d9935c717 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231003
 
-ARG VERSION=16.5.1
+ARG VERSION=16.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.21.3 \
-    GITLAB_SHELL_VERSION=14.29.0 \
-    GITLAB_PAGES_VERSION=16.5.1 \
-    GITALY_SERVER_VERSION=16.5.1 \
+    GOLANG_VERSION=1.21.4 \
+    GITLAB_SHELL_VERSION=14.30.0 \
+    GITLAB_PAGES_VERSION=16.6.0 \
+    GITALY_SERVER_VERSION=16.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 779abded0..4a74e4e03 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.5.1
+# sameersbn/gitlab:16.6.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.1
+docker pull sameersbn/gitlab:16.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.5.1
+ sameersbn/gitlab:16.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.5.1
+    sameersbn/gitlab:16.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:sanitize
+    sameersbn/gitlab:16.6.0 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake db:setup
+    sameersbn/gitlab:16.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.1
+docker pull sameersbn/gitlab:16.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.0
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 773e5b01b..bd015b903 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.5.1
+16.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 40dd50319..44eba4b65 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e89b57b08..61ee541a0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 22294623b..46b1f3a6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 50b195c12..e2fe0324a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.5.1
+docker pull sameersbn/gitlab:16.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.5.1
+sameersbn/gitlab:16.6.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 461d4de52..017935fc8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 895bf903b..97c104637 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.5.1
+    image: sameersbn/gitlab:16.6.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e325d3324..67371cf0f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.5.1
+        image: sameersbn/gitlab:16.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d74fb49fc9c05433acaaceaa9a3dcb70f1faa5a0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 2 Dec 2023 08:49:39 +0100
Subject: [PATCH 0911/1124] Upgrade to GitLab CE 16.6.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 581bf4699..986dd0abf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.6.1**
+
+- gitlab: upgrade CE to v16.6.1
+- gitaly: upgrade to v16.6.1
+- gitlab-pages: upgrade to v16.6.1
+- ubuntu: upgrade to focal-20231128
+
 **16.6.0**
 
 - gitlab: upgrade CE to v16.6.0
diff --git a/Dockerfile b/Dockerfile
index d9935c717..f32674d64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20231003
+FROM ubuntu:focal-20231128
 
-ARG VERSION=16.6.0
+ARG VERSION=16.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
     GOLANG_VERSION=1.21.4 \
     GITLAB_SHELL_VERSION=14.30.0 \
-    GITLAB_PAGES_VERSION=16.6.0 \
-    GITALY_SERVER_VERSION=16.6.0 \
+    GITLAB_PAGES_VERSION=16.6.1 \
+    GITALY_SERVER_VERSION=16.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4a74e4e03..4f05c8a7c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.6.0
+# sameersbn/gitlab:16.6.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.0
+docker pull sameersbn/gitlab:16.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.6.0
+ sameersbn/gitlab:16.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.6.0
+    sameersbn/gitlab:16.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:sanitize
+    sameersbn/gitlab:16.6.1 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake db:setup
+    sameersbn/gitlab:16.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.0
+docker pull sameersbn/gitlab:16.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.1
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index bd015b903..d9216d9a9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.6.0
+16.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 44eba4b65..a2e0e9dfb 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 61ee541a0..30da17031 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 46b1f3a6a..0c34b28a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e2fe0324a..857d5f00d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.0
+docker pull sameersbn/gitlab:16.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.6.0
+sameersbn/gitlab:16.6.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 017935fc8..634d48593 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 97c104637..e55ae62d1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.0
+    image: sameersbn/gitlab:16.6.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 67371cf0f..e2011e266 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.6.0
+        image: sameersbn/gitlab:16.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From ee2d0826218ffb650f24dc25714133fdd4777009 Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Mon, 4 Dec 2023 11:41:55 +0100
Subject: [PATCH 0912/1124] README.md: Docker is not new anymore

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4f05c8a7c..35e1dc1e7 100644
--- a/README.md
+++ b/README.md
@@ -93,9 +93,9 @@ See [Contributors](../../graphs/contributors) for the complete list developers t
 
 ## Issues
 
-Docker is a relatively new project and is active being developed and tested by a thriving community of developers and testers and every release of docker features many enhancements and bugfixes.
+Docker is actively being developed and tested by a thriving community of developers and testers and every release of Docker features many enhancements and bugfixes.
 
-Given the nature of the development and release cycle it is very important that you have the latest version of docker installed because any issue that you encounter might have already been fixed with a newer docker release.
+Given the nature of the development and release cycle it is very important that you have the latest version of Docker installed because any issue that you encounter might have already been fixed with a newer Docker release.
 
 Install the most recent version of the Docker Engine for your platform using the [official Docker releases](http://docs.docker.com/engine/installation/), which can also be installed using:
 

From d6a78cca23fe7a4400b0c27051c4ba327eb8a083 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 16 Dec 2023 23:28:49 +0100
Subject: [PATCH 0913/1124] Upgrade to GitLab CE 16.6.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 986dd0abf..e9017f26a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.6.2**
+
+- gitlab: upgrade CE to v16.6.2
+- gitaly: upgrade to v16.6.2
+- gitlab-pages: upgrade to v16.6.2
+- golang: upgrade to v1.21.5
+- ubuntu: upgrade to focal-20231211
+
 **16.6.1**
 
 - gitlab: upgrade CE to v16.6.1
diff --git a/Dockerfile b/Dockerfile
index f32674d64..d901e9627 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20231128
+FROM ubuntu:focal-20231211
 
-ARG VERSION=16.6.1
+ARG VERSION=16.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.0.6 \
     RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
-    GOLANG_VERSION=1.21.4 \
+    GOLANG_VERSION=1.21.5 \
     GITLAB_SHELL_VERSION=14.30.0 \
-    GITLAB_PAGES_VERSION=16.6.1 \
-    GITALY_SERVER_VERSION=16.6.1 \
+    GITLAB_PAGES_VERSION=16.6.2 \
+    GITALY_SERVER_VERSION=16.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 35e1dc1e7..1534ccc33 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.6.1
+# sameersbn/gitlab:16.6.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.1
+docker pull sameersbn/gitlab:16.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.6.1
+ sameersbn/gitlab:16.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.6.1
+    sameersbn/gitlab:16.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:sanitize
+    sameersbn/gitlab:16.6.2 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake db:setup
+    sameersbn/gitlab:16.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.1
+docker pull sameersbn/gitlab:16.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.2
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d9216d9a9..357607e88 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.6.1
+16.6.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a2e0e9dfb..ec06e5995 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 30da17031..ea6a5dac2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 0c34b28a5..cc147e5b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 857d5f00d..e066da900 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.1
+docker pull sameersbn/gitlab:16.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.6.1
+sameersbn/gitlab:16.6.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 634d48593..5c6e00e9c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e55ae62d1..133fb0da2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.1
+    image: sameersbn/gitlab:16.6.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e2011e266..2266874de 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.6.1
+        image: sameersbn/gitlab:16.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 00911c934deee289047291559d03a3a1f25cd6b2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 24 Dec 2023 13:11:35 +0100
Subject: [PATCH 0914/1124] Upgrade to GitLab CE 16.7.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 scripts/release-notes.sh                |  8 ++--
 12 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e9017f26a..f58da1439 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.7.0**
+
+- gitlab: upgrade CE to v16.7.0
+- gitaly: upgrade to v16.7.0
+- gitlab-pages: upgrade to v16.7.0
+- gitlab-shell: upgrade to v14.32.0
+- ruby: upgrade to v3.1.4
+
 **16.6.2**
 
 - gitlab: upgrade CE to v16.6.2
diff --git a/Dockerfile b/Dockerfile
index d901e9627..228d04b93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231211
 
-ARG VERSION=16.6.2
+ARG VERSION=16.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.0.6 \
-    RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \
+    RUBY_VERSION=3.1.4 \
+    RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
     GOLANG_VERSION=1.21.5 \
-    GITLAB_SHELL_VERSION=14.30.0 \
-    GITLAB_PAGES_VERSION=16.6.2 \
-    GITALY_SERVER_VERSION=16.6.2 \
+    GITLAB_SHELL_VERSION=14.32.0 \
+    GITLAB_PAGES_VERSION=16.7.0 \
+    GITALY_SERVER_VERSION=16.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1534ccc33..9a69d711c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.6.2
+# sameersbn/gitlab:16.7.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.2
+docker pull sameersbn/gitlab:16.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.6.2
+ sameersbn/gitlab:16.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.6.2
+    sameersbn/gitlab:16.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:sanitize
+    sameersbn/gitlab:16.7.0 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake db:setup
+    sameersbn/gitlab:16.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.2
+docker pull sameersbn/gitlab:16.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.0
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 357607e88..2e4239c31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.6.2
+16.7.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ec06e5995..0529eef73 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ea6a5dac2..c97fa63c5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cc147e5b8..ba9f18386 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e066da900..39f54e602 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.6.2
+docker pull sameersbn/gitlab:16.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.6.2
+sameersbn/gitlab:16.7.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5c6e00e9c..30f4fc4c0 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 133fb0da2..bd0bd9f1c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.6.2
+    image: sameersbn/gitlab:16.7.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2266874de..6edf8ed5d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.6.2
+        image: sameersbn/gitlab:16.7.0
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 0c84db159..42ee9ef7f 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -40,13 +40,13 @@ Please note that this version does not yet include any rework as a consequence o
 
 Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance!
 
-**GitLab 16.0 requires at least PostgreSQL 13.**
-
-You are kindly invited to provide contributions.
+Please note:
+- GitLab 16.6.x requires at least PostgreSQL 13.
+- As of GitLab 16.7, PostgreSQL 14 is the default version. However, PostgreSQL 14 isn't supported on Geo deployments and is planned for future releases (see <https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#1670>).
 
 ## Contributing
 
-If you find this image useful here's how you can help:
+You are kindly invited to provide contributions. If you find this image useful here's how you can help:
 
 - Send a Pull Request with your awesome new features and bug fixes
 - Be a part of the community and help resolve [issues](https://github.com/sameersbn/docker-gitlab/issues)

From 9b813743617ebc2f76db35efd178ab56342591e1 Mon Sep 17 00:00:00 2001
From: nickshek <alfshek@hotmail.com>
Date: Fri, 12 Jan 2024 17:35:14 +0800
Subject: [PATCH 0915/1124] Update GitLab version to 16.7.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f58da1439..53d3bb5bc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.7.2**
+
+- gitlab: upgrade CE to v16.7.2
+- gitaly: upgrade to v16.7.2
+- gitlab-pages: upgrade to v16.7.2
+
 **16.7.0**
 
 - gitlab: upgrade CE to v16.7.0
diff --git a/Dockerfile b/Dockerfile
index 228d04b93..1acd52dc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231211
 
-ARG VERSION=16.7.0
+ARG VERSION=16.7.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.1.4 \
     RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
     GOLANG_VERSION=1.21.5 \
     GITLAB_SHELL_VERSION=14.32.0 \
-    GITLAB_PAGES_VERSION=16.7.0 \
-    GITALY_SERVER_VERSION=16.7.0 \
+    GITLAB_PAGES_VERSION=16.7.2 \
+    GITALY_SERVER_VERSION=16.7.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9a69d711c..5b9ed9541 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.7.0
+# sameersbn/gitlab:16.7.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.0
+docker pull sameersbn/gitlab:16.7.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.7.0
+ sameersbn/gitlab:16.7.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.7.0
+    sameersbn/gitlab:16.7.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:sanitize
+    sameersbn/gitlab:16.7.2 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake db:setup
+    sameersbn/gitlab:16.7.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.7.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.0
+docker pull sameersbn/gitlab:16.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.2
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2e4239c31..64eae8f54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.0
+16.7.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0529eef73..7aff6120b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c97fa63c5..8ebea7593 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ba9f18386..4b8fd12f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 39f54e602..e530a0395 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.0
+docker pull sameersbn/gitlab:16.7.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.7.0
+sameersbn/gitlab:16.7.2
 ```
 
 
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index bd0bd9f1c..916c4f144 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6edf8ed5d..78e7cdd49 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.7.0
+        image: sameersbn/gitlab:16.7.2
         env:
         - name: TZ
           value: Asia/Kolkata

From ee8cd340caf3dc8caafc20a371f0bb7bb1ef0c09 Mon Sep 17 00:00:00 2001
From: Nick Shek <alfshek@hotmail.com>
Date: Fri, 12 Jan 2024 17:59:34 +0800
Subject: [PATCH 0916/1124] Update GitLab version to 16.7.2

---
 docs/docker-compose-keycloak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 30f4fc4c0..e93ab3226 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.0
+    image: sameersbn/gitlab:16.7.2
     depends_on:
     - redis
     - postgresql

From 80866611b55f765161ce488304ec15fce922226d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 12 Jan 2024 20:03:35 +0100
Subject: [PATCH 0917/1124] Upgrade golang to v1.21.6

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 53d3bb5bc..bbd23b2ff 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v16.7.2
 - gitaly: upgrade to v16.7.2
 - gitlab-pages: upgrade to v16.7.2
+- golang: upgrade to v1.21.6
 
 **16.7.0**
 
diff --git a/Dockerfile b/Dockerfile
index 1acd52dc0..3b1c6fbef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=16.7.2
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.1.4 \
     RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
-    GOLANG_VERSION=1.21.5 \
+    GOLANG_VERSION=1.21.6 \
     GITLAB_SHELL_VERSION=14.32.0 \
     GITLAB_PAGES_VERSION=16.7.2 \
     GITALY_SERVER_VERSION=16.7.2 \

From 2e8f9ced9fffbaeb1330dc7c42726e456d461cac Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 13 Jan 2024 15:36:59 +0100
Subject: [PATCH 0918/1124] Upgrade to GitLab CE 16.7.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bbd23b2ff..73bc7805a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.7.3**
+
+- gitlab: upgrade CE to v16.7.3
+- gitaly: upgrade to v16.7.3
+- gitlab-pages: upgrade to v16.7.3
+
 **16.7.2**
 
 - gitlab: upgrade CE to v16.7.2
diff --git a/Dockerfile b/Dockerfile
index 3b1c6fbef..943df10a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231211
 
-ARG VERSION=16.7.2
+ARG VERSION=16.7.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.1.4 \
     RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
     GOLANG_VERSION=1.21.6 \
     GITLAB_SHELL_VERSION=14.32.0 \
-    GITLAB_PAGES_VERSION=16.7.2 \
-    GITALY_SERVER_VERSION=16.7.2 \
+    GITLAB_PAGES_VERSION=16.7.3 \
+    GITALY_SERVER_VERSION=16.7.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5b9ed9541..1d8f73ef7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.7.2
+# sameersbn/gitlab:16.7.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.2
+docker pull sameersbn/gitlab:16.7.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.7.2
+ sameersbn/gitlab:16.7.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.7.2
+    sameersbn/gitlab:16.7.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:sanitize
+    sameersbn/gitlab:16.7.3 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake db:setup
+    sameersbn/gitlab:16.7.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.7.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.7.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.2
+docker pull sameersbn/gitlab:16.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.3
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 64eae8f54..38e176f31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.2
+16.7.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7aff6120b..907d00410 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8ebea7593..a585098f9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4b8fd12f7..720396c7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e530a0395..241be3be7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.2
+docker pull sameersbn/gitlab:16.7.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.7.2
+sameersbn/gitlab:16.7.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e93ab3226..8436c956e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 916c4f144..f98f83936 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.2
+    image: sameersbn/gitlab:16.7.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 78e7cdd49..8cd953291 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.7.2
+        image: sameersbn/gitlab:16.7.3
         env:
         - name: TZ
           value: Asia/Kolkata

From d16119b54bd838b69292e519e8a582ec9c07fc3e Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 3 Apr 2023 19:04:25 +0900
Subject: [PATCH 0919/1124] Remove ajv as an explicit dependency

There was an issue that `ajv` is not installed by mistake.
This issue have been fixed on upstream, a few years ago.

Now, we can revert the change.
This commit partially reverts 985d57afb9673b2f5acb1f12cbc13f230f6ec074
See sameersbn/gitlab#1358

It seems that fix MR on upstream is https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14543
but we cannot check diff because source / target branch removed by mistake

Anyway, no need to add ajv as an explicit dependency with (at least) gitlab v11 or later
---
 assets/build/install.sh  | 1 -
 assets/runtime/functions | 1 -
 2 files changed, 2 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index b266654d4..f70ebac6c 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -203,7 +203,6 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 
 # Installs nodejs packages required to compile webpack
 exec_as_git yarn install --production --pure-lockfile
-exec_as_git yarn add ajv@^4.0.0
 
 echo "Compiling assets. Please be patient, this could take a while..."
 exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096"
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8efd0a237..4762b98a0 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2168,7 +2168,6 @@ migrate_database() {
       echo "Prepare recomplie assets... Installing missing node_modules for assets"
       chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
       exec_as_git yarn install --production --pure-lockfile
-      exec_as_git yarn add ajv@^4.0.0
       echo "Recompiling assets (relative_url in use), this could take a while..."
       exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
     fi

From 3885a455d12a4e37ce829e590a763b4a3194e22f Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 18 Jan 2024 02:02:41 +0900
Subject: [PATCH 0920/1124] Add build patch to prevent rake task assets:compile
 to remove assets dir

GitLab does not launch after second run if relative url is used.
This is caused by following upstream change to remove assets directory on assets compile.
See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103715

This is introduced on v15.6.0
````sh
$ git -C ../gitlab.git/ tag --contains e46d92c0 | sort --version-sort | head -n 1
v15.6.0-ee
````

1. `sameersbn/gitlab` create symbolic link /home/git/gitlab/public/assets/
  to point /home/git/data/tmp/assets if relative url is used.
  This is to store assets in the docker volume to avoid unnecessary recompilations.
  These assets are removed and recompiled only when the gitlab version or relative url root is changed.
2. By the change provided by gitlab.com/gitlab-org/gitlab!103715,
  rake task `gitlab:assets:compile` became to remove assets directory directly (by `FileUtils.rm_rf()`).
  It does not remove compiled assets itself, but remove symlink /home/git/gitlab/public/assets .
  Then it compiles assets as usual, but they will be stored in newly-created normal directory /home/git/gitlab/public/assets/
3. On container down, whole container statement (except volumes) will be reset.
  These compiled assets will be removed as well because they are not in docker volume.
4. As we store version info and relative url root path to /home/git/data/tmp/,
  we cannot recognize we have to recompile assets (that have been removed by mistake)

To avoid the issue, this commit add a build time patch to change the behavior of rake task `gitlab:assets:compile`
to empty assets instead of removing assets directory itself.
---
 ...4-fix-raketask-gitlab-assets-compile.patch | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch

diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
new file mode 100644
index 000000000..f03bf8e5f
--- /dev/null
+++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
@@ -0,0 +1,20 @@
+diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake
+index b8a6e7018767..5096d81ea63f 100644
+--- a/lib/tasks/gitlab/assets.rake
++++ b/lib/tasks/gitlab/assets.rake
+@@ -96,7 +96,14 @@ namespace :gitlab do
+       puts "Assets SHA256 for `HEAD`: #{Tasks::Gitlab::Assets.head_assets_sha256.inspect}"
+ 
+       if Tasks::Gitlab::Assets.head_assets_sha256 != Tasks::Gitlab::Assets.master_assets_sha256
+-        FileUtils.rm_rf([Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR] + Dir.glob('app/assets/javascripts/locale/**/app.js'))
++        # sameersbn/gitlab takes a cache of public_assets_dir by symlinking to volume to speedup relaunch (if relative url is used)
++        # so do not remove the directory directly, empty instead
++        # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually
++        removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js')
++        if Dir.exists?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
++          removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} 
++        end
++        FileUtils.rm_rf(removal_targets, secure: true)
+ 
+         # gettext:compile needs to run before rake:assets:precompile because
+         # app/assets/javascripts/locale/**/app.js are pre-compiled by Sprockets

From 7a536bcdfdd5ceea6795ef8f0a8a579804892a69 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 19 Jan 2024 22:59:19 +0100
Subject: [PATCH 0921/1124] Upgrade to GitLab CE 16.8.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 73bc7805a..e4019a53b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.8.0**
+
+- gitlab: upgrade CE to v16.8.0
+- gitaly: upgrade to v16.8.0
+- gitlab-pages: upgrade to v16.8.0
+
 **16.7.3**
 
 - gitlab: upgrade CE to v16.7.3
diff --git a/Dockerfile b/Dockerfile
index 943df10a3..6d367b882 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231211
 
-ARG VERSION=16.7.3
+ARG VERSION=16.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.1.4 \
     RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
     GOLANG_VERSION=1.21.6 \
     GITLAB_SHELL_VERSION=14.32.0 \
-    GITLAB_PAGES_VERSION=16.7.3 \
-    GITALY_SERVER_VERSION=16.7.3 \
+    GITLAB_PAGES_VERSION=16.8.0 \
+    GITALY_SERVER_VERSION=16.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 1d8f73ef7..82b42dc61 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.7.3
+# sameersbn/gitlab:16.8.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.3
+docker pull sameersbn/gitlab:16.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.7.3
+ sameersbn/gitlab:16.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.7.3
+    sameersbn/gitlab:16.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:sanitize
+    sameersbn/gitlab:16.8.0 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake db:setup
+    sameersbn/gitlab:16.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:env:info
+    sameersbn/gitlab:16.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.3
+docker pull sameersbn/gitlab:16.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.0
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 38e176f31..93eef160e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.3
+16.8.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 907d00410..af19e479a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a585098f9..2582b09df 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 720396c7a..f74998c1f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 241be3be7..359730b1b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.7.3
+docker pull sameersbn/gitlab:16.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.7.3
+sameersbn/gitlab:16.8.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8436c956e..1241a9e16 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f98f83936..ab66673f1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.7.3
+    image: sameersbn/gitlab:16.8.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8cd953291..4dd1ee000 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.7.3
+        image: sameersbn/gitlab:16.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From b546aeb9556c1eba3da38aff83394a7096a6408d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 25 Jan 2024 22:05:03 +0100
Subject: [PATCH 0922/1124] Upgrade GitLab CE to 16.8.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4019a53b..cafdd8d7d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.8.1**
+
+- gitlab: upgrade CE to v16.8.1
+- gitaly: upgrade to v16.8.1
+- gitlab-pages: upgrade to v16.8.1
+- gitlab-shell: upgrade to v14.33.0
+
 **16.8.0**
 
 - gitlab: upgrade CE to v16.8.0
diff --git a/Dockerfile b/Dockerfile
index 6d367b882..0092435ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20231211
 
-ARG VERSION=16.8.0
+ARG VERSION=16.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.1.4 \
     RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
     GOLANG_VERSION=1.21.6 \
-    GITLAB_SHELL_VERSION=14.32.0 \
-    GITLAB_PAGES_VERSION=16.8.0 \
-    GITALY_SERVER_VERSION=16.8.0 \
+    GITLAB_SHELL_VERSION=14.33.0 \
+    GITLAB_PAGES_VERSION=16.8.1 \
+    GITALY_SERVER_VERSION=16.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 82b42dc61..a50c2eab0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.8.0
+# sameersbn/gitlab:16.8.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.0
+docker pull sameersbn/gitlab:16.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.8.0
+ sameersbn/gitlab:16.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.8.0
+    sameersbn/gitlab:16.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:sanitize
+    sameersbn/gitlab:16.8.1 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake db:setup
+    sameersbn/gitlab:16.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.0
+docker pull sameersbn/gitlab:16.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.1
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 93eef160e..f49d56fbb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.8.0
+16.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index af19e479a..4fa2d8f19 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2582b09df..d814f6fd7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f74998c1f..3213e612e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 359730b1b..bd4d20918 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.0
+docker pull sameersbn/gitlab:16.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.8.0
+sameersbn/gitlab:16.8.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1241a9e16..80ad32d73 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ab66673f1..6cb4b7649 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.0
+    image: sameersbn/gitlab:16.8.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 4dd1ee000..ec7670255 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.8.0
+        image: sameersbn/gitlab:16.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 9345235f27a4367d9c96c4e157745eb42a6b0337 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 26 Jan 2024 15:40:16 +0900
Subject: [PATCH 0923/1124] Replace removed function in patch for
 `assets::compile`

`Dir.exists?(file_name) -> bool` have been deprecated since Ruby 2.1
and removed on Ruby 3.2.
See https://bugs.ruby-lang.org/issues/17391

Replacement is `Dir.exist?(file_name) -> bool`.
---
 .../build/patches/0004-fix-raketask-gitlab-assets-compile.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
index f03bf8e5f..7563b75a0 100644
--- a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
+++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
@@ -11,7 +11,7 @@ index b8a6e7018767..5096d81ea63f 100644
 +        # so do not remove the directory directly, empty instead
 +        # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually
 +        removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js')
-+        if Dir.exists?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
++        if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
 +          removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} 
 +        end
 +        FileUtils.rm_rf(removal_targets, secure: true)

From 1c286f72d1e19a119b979ef177b90cf06bb5bc3f Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 26 Jan 2024 15:42:54 +0900
Subject: [PATCH 0924/1124] Remove trailing whitespace in patch for
 `assets:compile`

to suppress warning on build like below:

    Applying patch /etc/docker-gitlab/build/patches/0004-fix-raketask-gitlab-assets-compile.patch for gitlab-foss...
    <stdin>:15: trailing whitespace.
           removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
    warning: 1 line adds whitespace errors.
---
 .../build/patches/0004-fix-raketask-gitlab-assets-compile.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
index 7563b75a0..a0877b832 100644
--- a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
+++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
@@ -12,7 +12,7 @@ index b8a6e7018767..5096d81ea63f 100644
 +        # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually
 +        removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js')
 +        if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR)
-+          removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} 
++          removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)}
 +        end
 +        FileUtils.rm_rf(removal_targets, secure: true)
  

From acabea3a493d80024adfc5f37e224a57c5d31e5d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 28 Nov 2023 10:13:03 +0900
Subject: [PATCH 0925/1124] Update Ruby to 3.2.3

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0092435ed..627a57ae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:focal-20231211
 ARG VERSION=16.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.1.4 \
-    RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \
+    RUBY_VERSION=3.2.3 \
+    RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.21.6 \
     GITLAB_SHELL_VERSION=14.33.0 \
     GITLAB_PAGES_VERSION=16.8.1 \

From 3f2e8c2ce4eb9c521e25ca6afaedf66a8fd62b6b Mon Sep 17 00:00:00 2001
From: Daniel Mulholland <dan.mulholland@gmail.com>
Date: Sun, 11 Feb 2024 10:17:36 +1300
Subject: [PATCH 0926/1124] Create ci_secure_files directory if missing, closes
 #2790

---
 assets/runtime/functions | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4762b98a0..42ce83b9b 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1659,7 +1659,12 @@ initialize_datadir() {
   chmod u+rwX ${GITLAB_SHARED_DIR}
   chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}
 
-  # create attifacts dir
+  # create the ci_secure_files directory
+  mkdir -p ${GITLAB_SHARED_DIR}/ci_secure_files
+  chmod u+rwX ${GITLAB_SHARED_DIR}/ci_secure_files
+  chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/ci_secure_files
+
+  # create artifacts dir
   mkdir -p ${GITLAB_ARTIFACTS_DIR}
   chmod u+rwX ${GITLAB_ARTIFACTS_DIR}
   chown ${GITLAB_USER}: ${GITLAB_ARTIFACTS_DIR}

From e636b969a9cc75ed41083565a829a3e74ec5c131 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 29 Jan 2024 18:20:18 +0900
Subject: [PATCH 0927/1124] Revise build patch structure

to allow patching each middleware or library

Just move patches to assets/build/patches/gitlabhq
Folder name are matched to assets/runtime/config
---
 assets/build/install.sh                                         | 2 +-
 ...fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak | 0
 ...002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak | 0
 ...-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch | 0
 .../0004-fix-raketask-gitlab-assets-compile.patch               | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename assets/build/patches/{ => gitlabhq}/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak (100%)
 rename assets/build/patches/{ => gitlabhq}/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak (100%)
 rename assets/build/patches/{ => gitlabhq}/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch (100%)
 rename assets/build/patches/{ => gitlabhq}/0004-fix-raketask-gitlab-assets-compile.patch (100%)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index f70ebac6c..37fb485b0 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -84,7 +84,7 @@ exec_as_git git config --global --add safe.directory /home/git/gitlab
 echo "Cloning gitlab-foss v.${GITLAB_VERSION}..."
 exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR}
 
-find "${GITLAB_BUILD_DIR}/patches/" -name "*.patch" | while read -r patch_file; do
+find "${GITLAB_BUILD_DIR}/patches/gitlabhq" -name "*.patch" | while read -r patch_file; do
   printf "Applying patch %s for gitlab-foss...\n" "${patch_file}"
   exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < "${patch_file}"
 done
diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak b/assets/build/patches/gitlabhq/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak
similarity index 100%
rename from assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak
rename to assets/build/patches/gitlabhq/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak
diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak b/assets/build/patches/gitlabhq/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak
similarity index 100%
rename from assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak
rename to assets/build/patches/gitlabhq/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak
diff --git a/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
similarity index 100%
rename from assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
rename to assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch
similarity index 100%
rename from assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch
rename to assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch

From 9f5961939dd859ff3c4567312d430656d602e320 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 30 Jan 2024 12:17:18 +0900
Subject: [PATCH 0928/1124] Allow patching Ruby, add patch for
 lib/securernadom.rb

Backport: fix behavior of `SecureRandom.gen_random_openssl(n)`
commit:
https://github.com/ruby/ruby/commit/64e503eb62aff0952b655e9a86217e355f786146

This has been merged into the Ruby 3.3 release, but Ruby (at least) 3.0 and later are affected by the issues fixed by this commit.
---
 assets/build/install.sh                       |  4 ++
 .../0001-avoid-seeding_until-ruby3.3.0.patch  | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 37fb485b0..31a23b691 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -47,6 +47,10 @@ mkdir /tmp/ruby && cd /tmp/ruby
 curl --remote-name -Ss "${RUBY_SRC_URL}"
 printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c -
 tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}"
+find "${GITLAB_BUILD_DIR}/patches/ruby" -name "*.patch" | while read -r patch_file; do
+  echo "Applying patch ${patch_file}"
+  patch -p1 -i "${patch_file}"
+done
 ./configure --disable-install-rdoc --enable-shared
 make -j"$(nproc)"
 make install
diff --git a/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch b/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch
new file mode 100644
index 000000000..5fd7dcbe7
--- /dev/null
+++ b/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch
@@ -0,0 +1,45 @@
+From 64e503eb62aff0952b655e9a86217e355f786146 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
+ <shyouhei@ruby-lang.org>
+Date: Thu, 13 Apr 2023 15:36:24 +0900
+Subject: [PATCH] avoid seeding
+
+OpenSSL's man page previously stated that "the application is
+responsible for seeding the PRNG by calling RAND_add" (see [1]).
+So we had this code.  However things changed.  They no longer
+say so, instead "manual (re-)seeding of the default OpenSSL
+random generator is not necessary" now (see [2]).  It seems all
+OpenSSL versions that we support now already behaves like this.
+Let's follow that.
+
+[1]: https://www.openssl.org/docs/man1.0.2/man3/RAND_add.html
+[2]: https://www.openssl.org/docs/manmaster/man3/RAND_add.html
+---
+ lib/securerandom.rb | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/lib/securerandom.rb b/lib/securerandom.rb
+index 07ae048634..c5be6ce734 100644
+--- a/lib/securerandom.rb
++++ b/lib/securerandom.rb
+@@ -47,17 +47,6 @@ def bytes(n)
+     private
+ 
+     def gen_random_openssl(n)
+-      @pid = 0 unless defined?(@pid)
+-      pid = $$
+-      unless @pid == pid
+-        now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+-        OpenSSL::Random.random_add([now, @pid, pid].join(""), 0.0)
+-        seed = Random.urandom(16)
+-        if (seed)
+-          OpenSSL::Random.random_add(seed, 16)
+-        end
+-        @pid = pid
+-      end
+       return OpenSSL::Random.random_bytes(n)
+     end
+ 
+-- 
+2.43.0.windows.1
+

From 82b2c171624a3aeb864dfdaac5267edf8e7ef51c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 12 Feb 2024 20:01:30 +0100
Subject: [PATCH 0929/1124] Upgrade GitLab CE to 16.8.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cafdd8d7d..b4763c4fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.8.2**
+
+- gitlab: upgrade CE to v16.8.2
+- gitaly: upgrade to v16.8.2
+- gitlab-pages: upgrade to v16.8.2
+- golang: upgrade to v1.22.0
+- ubuntu: upgrade to focal-20240123
+
 **16.8.1**
 
 - gitlab: upgrade CE to v16.8.1
diff --git a/Dockerfile b/Dockerfile
index 627a57ae9..096231618 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20231211
+FROM ubuntu:focal-20240123
 
-ARG VERSION=16.8.1
+ARG VERSION=16.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
-    GOLANG_VERSION=1.21.6 \
+    GOLANG_VERSION=1.22.0 \
     GITLAB_SHELL_VERSION=14.33.0 \
-    GITLAB_PAGES_VERSION=16.8.1 \
-    GITALY_SERVER_VERSION=16.8.1 \
+    GITLAB_PAGES_VERSION=16.8.2 \
+    GITALY_SERVER_VERSION=16.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a50c2eab0..8f2fa3389 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.8.1
+# sameersbn/gitlab:16.8.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.1
+docker pull sameersbn/gitlab:16.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.8.1
+ sameersbn/gitlab:16.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.8.1
+    sameersbn/gitlab:16.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:sanitize
+    sameersbn/gitlab:16.8.2 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake db:setup
+    sameersbn/gitlab:16.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.1
+docker pull sameersbn/gitlab:16.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.2
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f49d56fbb..46d096593 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.8.1
+16.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4fa2d8f19..1fb6f2dc5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d814f6fd7..209e3a6db 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 3213e612e..8031dd331 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bd4d20918..b69a23c29 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.1
+docker pull sameersbn/gitlab:16.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.8.1
+sameersbn/gitlab:16.8.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 80ad32d73..9377ff6ca 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6cb4b7649..8bc2ad6b0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.1
+    image: sameersbn/gitlab:16.8.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ec7670255..d82e37a94 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.8.1
+        image: sameersbn/gitlab:16.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From d5bc564601ed198d7e2b850db0c5527382deba05 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 Feb 2024 17:30:11 +0100
Subject: [PATCH 0930/1124] Upgrade GitLab CE to 16.9.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b4763c4fe..01b6de3ff 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.9.0**
+
+- gitlab: upgrade CE to v16.9.0
+- gitaly: upgrade to v16.9.0
+- gitlab-pages: upgrade to v16.9.0
+
 **16.8.2**
 
 - gitlab: upgrade CE to v16.8.2
diff --git a/Dockerfile b/Dockerfile
index 096231618..4d4a914d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240123
 
-ARG VERSION=16.8.2
+ARG VERSION=16.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.0 \
     GITLAB_SHELL_VERSION=14.33.0 \
-    GITLAB_PAGES_VERSION=16.8.2 \
-    GITALY_SERVER_VERSION=16.8.2 \
+    GITLAB_PAGES_VERSION=16.9.0 \
+    GITALY_SERVER_VERSION=16.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 8f2fa3389..cd02fb33d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.8.2
+# sameersbn/gitlab:16.9.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.2
+docker pull sameersbn/gitlab:16.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.8.2
+ sameersbn/gitlab:16.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.8.2
+    sameersbn/gitlab:16.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:sanitize
+    sameersbn/gitlab:16.9.0 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake db:setup
+    sameersbn/gitlab:16.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.2
+docker pull sameersbn/gitlab:16.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.0
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 46d096593..bda6c1083 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.8.2
+16.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1fb6f2dc5..6ba329927 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 209e3a6db..9e1be5dc3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 8031dd331..b45e51e23 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b69a23c29..a7ffb81d5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.8.2
+docker pull sameersbn/gitlab:16.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.8.2
+sameersbn/gitlab:16.9.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9377ff6ca..5277457fd 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8bc2ad6b0..fa7f43148 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.8.2
+    image: sameersbn/gitlab:16.9.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d82e37a94..7fe0a756c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.8.2
+        image: sameersbn/gitlab:16.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 9b9b83db4e10ed2ada4beaf0bbfa531fc2ad1528 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 Feb 2024 17:52:51 +0100
Subject: [PATCH 0931/1124] Update orbs of CircleCI configuration

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4bafdaecf..a048814b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,9 @@
 version: 2.1
 
 orbs:
-  shellcheck: circleci/shellcheck@3.1.1
-  docker: circleci/docker@2.4.0
-  go: circleci/go@1.7.1
+  shellcheck: circleci/shellcheck@3.2.0
+  docker: circleci/docker@2.5.0
+  go: circleci/go@1.11.0
 
 commands:
   docker-build:

From a9451704ad3f67dbbea875e7bf745a1cd59e86fd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 21 Feb 2024 21:52:08 +0100
Subject: [PATCH 0932/1124] Upgrade GitLab CE to 16.9.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 01b6de3ff..3f1fcad8c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.9.1**
+
+- gitlab: upgrade CE to v16.9.1
+- gitaly: upgrade to v16.9.1
+- gitlab-pages: upgrade to v16.9.1
+
 **16.9.0**
 
 - gitlab: upgrade CE to v16.9.0
diff --git a/Dockerfile b/Dockerfile
index 4d4a914d3..a30618537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240123
 
-ARG VERSION=16.9.0
+ARG VERSION=16.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.0 \
     GITLAB_SHELL_VERSION=14.33.0 \
-    GITLAB_PAGES_VERSION=16.9.0 \
-    GITALY_SERVER_VERSION=16.9.0 \
+    GITLAB_PAGES_VERSION=16.9.1 \
+    GITALY_SERVER_VERSION=16.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index cd02fb33d..066d33dcd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.9.0
+# sameersbn/gitlab:16.9.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.0
+docker pull sameersbn/gitlab:16.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.9.0
+ sameersbn/gitlab:16.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.9.0
+    sameersbn/gitlab:16.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:sanitize
+    sameersbn/gitlab:16.9.1 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake db:setup
+    sameersbn/gitlab:16.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.0
+docker pull sameersbn/gitlab:16.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.1
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index bda6c1083..06e751596 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.9.0
+16.9.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6ba329927..23c6fcf4a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9e1be5dc3..cf7824a67 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b45e51e23..303c830f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a7ffb81d5..5b117e0f9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.0
+docker pull sameersbn/gitlab:16.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.9.0
+sameersbn/gitlab:16.9.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5277457fd..2f8cd4cde 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fa7f43148..41dc8e75b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.0
+    image: sameersbn/gitlab:16.9.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7fe0a756c..40ac42da9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.9.0
+        image: sameersbn/gitlab:16.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 689751cb916dd805197d09aeea58e360a4457bfb Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 7 Mar 2024 18:56:27 +0100
Subject: [PATCH 0933/1124] Upgrade GitLab CE to 16.9.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3f1fcad8c..f3a2df488 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.9.2**
+
+- gitlab: upgrade CE to v16.9.2
+- gitaly: upgrade to v16.9.2
+- gitlab-pages: upgrade to v16.9.2
+- golang: upgrade to v1.22.1
+- ubuntu: upgrade to focal-20240216
+
 **16.9.1**
 
 - gitlab: upgrade CE to v16.9.1
diff --git a/Dockerfile b/Dockerfile
index a30618537..807ba99ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20240123
+FROM ubuntu:focal-20240216
 
-ARG VERSION=16.9.1
+ARG VERSION=16.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
-    GOLANG_VERSION=1.22.0 \
+    GOLANG_VERSION=1.22.1 \
     GITLAB_SHELL_VERSION=14.33.0 \
-    GITLAB_PAGES_VERSION=16.9.1 \
-    GITALY_SERVER_VERSION=16.9.1 \
+    GITLAB_PAGES_VERSION=16.9.2 \
+    GITALY_SERVER_VERSION=16.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 066d33dcd..b38c15409 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.9.1
+# sameersbn/gitlab:16.9.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.1
+docker pull sameersbn/gitlab:16.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.9.1
+ sameersbn/gitlab:16.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.9.1
+    sameersbn/gitlab:16.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:sanitize
+    sameersbn/gitlab:16.9.2 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake db:setup
+    sameersbn/gitlab:16.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.1
+docker pull sameersbn/gitlab:16.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.2
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 06e751596..1a63fd567 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.9.1
+16.9.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 23c6fcf4a..de36bda31 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index cf7824a67..aaccbb198 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 303c830f0..908b22bf6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5b117e0f9..ba8c8a284 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.1
+docker pull sameersbn/gitlab:16.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.9.1
+sameersbn/gitlab:16.9.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 2f8cd4cde..1862df9f0 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 41dc8e75b..a6d4dd2ef 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.1
+    image: sameersbn/gitlab:16.9.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 40ac42da9..1c1aeb3e3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.9.1
+        image: sameersbn/gitlab:16.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 12c97f194a13a351951dda9aa5107ec5f65b53d0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 21 Mar 2024 21:39:44 +0100
Subject: [PATCH 0934/1124] Upgrade GitLab CE to 16.10.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f3a2df488..25a08c61b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.10.0**
+
+- gitlab: upgrade CE to v16.10.0
+- gitaly: upgrade to v16.10.0
+- gitlab-pages: upgrade to v16.10.0
+- gitlab-shell: upgrade to v14.34.0
+
 **16.9.2**
 
 - gitlab: upgrade CE to v16.9.2
diff --git a/Dockerfile b/Dockerfile
index 807ba99ec..65d9a2456 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240216
 
-ARG VERSION=16.9.2
+ARG VERSION=16.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.1 \
-    GITLAB_SHELL_VERSION=14.33.0 \
-    GITLAB_PAGES_VERSION=16.9.2 \
-    GITALY_SERVER_VERSION=16.9.2 \
+    GITLAB_SHELL_VERSION=14.34.0 \
+    GITLAB_PAGES_VERSION=16.10.0 \
+    GITALY_SERVER_VERSION=16.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b38c15409..dec41d512 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.9.2
+# sameersbn/gitlab:16.10.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.2
+docker pull sameersbn/gitlab:16.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 ### Database
@@ -287,7 +287,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -331,7 +331,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -370,7 +370,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 #### Linking to Redis Container
@@ -397,7 +397,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 #### Mail
@@ -410,7 +410,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -430,7 +430,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -514,7 +514,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.9.2
+ sameersbn/gitlab:16.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -553,7 +553,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -601,7 +601,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -783,14 +783,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.9.2
+    sameersbn/gitlab:16.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:sanitize
+    sameersbn/gitlab:16.10.0 app:sanitize
 ```
 
 #### Piwik
@@ -2472,7 +2472,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2507,14 +2507,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake db:setup
+    sameersbn/gitlab:16.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2572,7 +2572,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.2
+docker pull sameersbn/gitlab:16.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2670,7 +2670,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.0
 ```
 
 ### Shell Access
@@ -2708,7 +2708,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1a63fd567..3027af39c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.9.2
+16.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index de36bda31..aa04d5d35 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index aaccbb198..cc8c83ea3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 908b22bf6..016f5aa54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index ba8c8a284..45f2b901a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.9.2
+docker pull sameersbn/gitlab:16.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.9.2
+sameersbn/gitlab:16.10.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1862df9f0..e6cdd48da 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a6d4dd2ef..6256cad3d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.9.2
+    image: sameersbn/gitlab:16.10.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1c1aeb3e3..6e27c01e3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.9.2
+        image: sameersbn/gitlab:16.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 846a051bbeb3a702ca0c443c5b8c4ad4a610d7c2 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 29 Feb 2024 11:21:22 +0900
Subject: [PATCH 0935/1124] Allow additional configurations after DB migration

Such as feature flags (which is stored to database, application_settings table)

At this commit, it does nothing (no operation `:`)
---
 assets/runtime/functions | 4 ++++
 entrypoint.sh            | 1 +
 2 files changed, 5 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 42ce83b9b..3268d1831 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2006,6 +2006,10 @@ configure_gitlab() {
   rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket
 }
 
+configure_gitlab_requires_db() {
+  :
+}
+
 configure_gitlab_shell() {
   echo "Configuring gitlab-shell..."
   update_template ${GITLAB_SHELL_CONFIG} \
diff --git a/entrypoint.sh b/entrypoint.sh
index 1d9bc107c..c5a4e3536 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -21,6 +21,7 @@ case ${1} in
         /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf &
         SUPERVISOR_PID=$!
         migrate_database
+        configure_gitlab_requires_db
         kill -15 $SUPERVISOR_PID
         if ps h -p $SUPERVISOR_PID > /dev/null ; then
         wait $SUPERVISOR_PID || true

From 05794a2b478e2efa28b9898d69cd3e8f57690fd5 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 29 Feb 2024 11:23:19 +0900
Subject: [PATCH 0936/1124] Allow setting feature flags via configuration
 parameter

- It requires database is set up because
  feature flags are stored to DB (table `application_settings`)
- Add configuration parameter GITLAB_FEATURE_FLAGS_ENABLE_TARGETS
  and GITLAB_FEATURE_FLAGS_DISABLE_TARGETS
- Add ruby script to configure feature flags from command line
  and invoke runtime (from configure_gitlab())
---
 README.md                                     | 58 ++++++++++++
 assets/runtime/env-defaults                   |  4 +
 assets/runtime/functions                      | 49 +++++++++-
 .../scripts/configure_feature_flags.rb        | 90 +++++++++++++++++++
 entrypoint.sh                                 |  2 +-
 5 files changed, 201 insertions(+), 2 deletions(-)
 create mode 100644 assets/runtime/scripts/configure_feature_flags.rb

diff --git a/README.md b/README.md
index dec41d512..59392261d 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
     - [Piwik](#piwik)
+    - [Feature flags](#feature-flags)
     - [Exposing ssh port in dockerized gitlab-ce](docs/exposing-ssh-port.md)
     - [Available Configuration Parameters](#available-configuration-parameters)
 - [Maintenance](#maintenance)
@@ -801,6 +802,52 @@ These options should contain something like:
 - `PIWIK_URL=piwik.example.org`
 - `PIWIK_SITE_ID=42`
 
+#### Feature flags
+
+In this section, we talk about feature flags that administrators can change the state (See <https://docs.gitlab.com/ee/administration/feature_flags.html>). If you are looking for documentation for "Feature flags" that configured on project deploy settings, see <https://docs.gitlab.com/ee/operations/feature_flags.html>
+
+GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source).  
+You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>  
+
+For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods.  
+This image searches yml files in [`${GITLAB_INSTALL_DIR}/config/feature_flags`](https://gitlab.com/gitlab-org/gitlab-foss/-/tree/master/config/feature_flags) (typically `/home/git/gitlab/config/feature_flags/`) recursively and use the file list as a source of active feature flags.
+
+Here is a part of example `docker-compose.yml`:
+
+````yml
+services:
+  gitlab:
+    image: sameersbn/gitlab:latest
+    environment:
+    - GITLAB_FEATURE_FLAGS_DISABLE_TARGETS=auto_devops_banner_disabled,ci_enable_live_trace
+    - GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=git_push_create_all_pipelines,build_service_proxy
+````
+
+Once the container up, you can see following messages in container log like below.  
+
+````sh
+...
+Configuring gitlab::feature_flags...
+- specified feature flags: {:to_be_disabled=>["auto_devops_banner_disabled", "ci_enable_live_trace"], :to_be_enabled=>["git_push_create_all_pipelines", "build_service_proxy"]}
+- auto_devops_banner_disabled : off
+- ci_enable_live_trace : off
+- git_push_create_all_pipelines : on
+- build_service_proxy : on
+...
+````
+
+If specified flag names are not included in the list, they will be ignored and appears to container log like below:
+
+````sh
+...
+Configuring gitlab::feature_flags...
+- specified feature flags: {:to_be_disabled=>["auto_devops_banner_disabled", "invalid_flag_name"], :to_be_enabled=>["git_push_create_all_pipelines", "another_invalid_flag_name"]}
+- Following flags are probably invalid and have been ignored: invalid_flag_name,another_invalid_flag_name
+- auto_devops_banner_disabled : off
+- git_push_create_all_pipelines : on
+...
+````
+
 #### Available Configuration Parameters
 
 *Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)*
@@ -1619,6 +1666,17 @@ The value of the `worker-src` directive in the `Content-Security-Policy` header.
 
 The value of the `report-uri` directive in the `Content-Security-Policy` header
 
+##### `GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`
+
+Comma separated list of feature flag names to be disabled. No whitespace is allowed.  
+You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>  
+Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log.  
+No defaults.
+
+##### `GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`
+
+This parameter is the same as [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_enable_targets), except its purpose is to enable the feature flag. No defaults.
+
 ##### `SSL_SELF_SIGNED`
 
 Set to `true` when using self signed ssl certificates. `false` by default.
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 4c0a529f2..86e0bd833 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -637,3 +637,7 @@ GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC=${GITLAB_CONTENT_SECURITY_P
 GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC:-"'self' 'unsafe-inline'"}
 GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC:-"'self' blob:"}
 GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI:-}
+
+## Feature Flags
+GITLAB_FEATURE_FLAGS_DISABLE_TARGETS=${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS:-}
+GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 3268d1831..4a3759a68 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2006,8 +2006,55 @@ configure_gitlab() {
   rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket
 }
 
+# feature flags are recorded to database (schema "application_settings") so requires DB is (at least) initialized
+gitlab_configure_feature_flags() {  
+  echo "Configuring gitlab::feature_flags..."
+
+  if [[ -z "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" && -z "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" ]]; then
+    # Do nothing and reports no error if no targets specified
+    echo "- No targets specified. skipping..."
+    return 0
+  fi
+
+  # Build command line argument for script only when target is specified
+  # If not, scripts fails because option specifier is recognized as feature flags for example
+  # like "--disable --enable" : for this case, --disable is recognized as a value of option "--enable"
+  if [[ -n "${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS}" ]]; then
+    GITLAB_FEATURE_FLAGS_DISABLE_TARGETS="--disable ${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS}"
+  fi
+  # The same goes for --enable (this is the last option passed to "rails runner" that will be run below)
+  # For this case (final option), it throws "missing argument" error for execution like:
+  # like "--disable feature1,feature2 --enable"
+  if [[ -n "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" ]]; then
+    GITLAB_FEATURE_FLAGS_ENABLE_TARGETS="--enable ${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}"
+  fi
+
+  PWD_ORG=${PWD}
+  cd "${GITLAB_INSTALL_DIR}"
+
+  # copy the script to temporal directory : to avoid permission issue
+  cp "${GITLAB_RUNTIME_DIR}/scripts/configure_feature_flags.rb" "${GITLAB_TEMP_DIR}/"
+  chown "${GITLAB_USER}:" "${GITLAB_TEMP_DIR}/configure_feature_flags.rb"
+
+  echo "- Launching rails runner to set feature flags. This will take some time...."
+
+  # If arguments are empty, the script will do nothing and print object dump like below:
+  #  - specified feature flags: {:to_be_disabled=>[], :to_be_enabled=>[]}
+  # DO NOT qupte variables : word splitting must be enabled.
+  # If disabled, whole string like '--disable feature_name_1,feature_name_2'
+  # will be recognized as single option and results to invalid argument error
+  #
+  # shellcheck disable=SC2086
+  exec_as_git bundle exec rails runner "${GITLAB_TEMP_DIR}/configure_feature_flags.rb" \
+    ${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS} \
+    ${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}
+
+  rm "${GITLAB_TEMP_DIR}/configure_feature_flags.rb"
+  cd "${PWD_ORG}"
+}
+
 configure_gitlab_requires_db() {
-  :
+  gitlab_configure_feature_flags
 }
 
 configure_gitlab_shell() {
diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb
new file mode 100644
index 000000000..484cf62ee
--- /dev/null
+++ b/assets/runtime/scripts/configure_feature_flags.rb
@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require "optparse"
+require "set"
+
+# sameersbn/docker-gitlab
+# Ruby script to configure feature flags via CLI
+# Intended to be executed in the context of Rails Runner of Gitlab application
+# (to get valid "Feature" module, defined in (gitlab root)/lib/feature.rb)
+# https://guides.rubyonrails.org/command_line.html#bin-rails-runner
+#   bundle exec rails runner <path to this script> -- --enable <enable target> --disable <disable target>
+
+class FeatureFlagCLI
+  def available_feature_flags()
+    # Feature flag lists are stored in (Gitlab root directory)/config/feature_flags/
+    # We can get the directory by accessing "root" property of "Gitlab" Module
+    # (may returns /home/git/gitlab for sameersbn/docker-gitlab)
+    feature_flag_yamls = Dir.glob("#{Gitlab.root}/config/feature_flags/**/*.yml")
+
+    if Gitlab.ee?
+      feature_flag_yamls.concat(Dir.glob("#{Gitlab.root}/ee/config/feature_flags/**/*.yml"))
+    end if
+
+      list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) }
+    list
+  end
+
+  def parse_options(argv = ARGV)
+    op = OptionParser.new
+
+    opts = {
+      to_be_disabled: [],
+      to_be_enabled: [],
+    # TODO support "opt out", "opt out removed"
+    # to_be_opted_out: [],
+    # opt_out_removed: [],
+    }
+
+    op.on("-d", "--disable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be disabled (defaults: ${opts[:to_be_disabled]})") { |v|
+      opts[:to_be_disabled] = v.uniq
+    }
+    op.on("-e", "--enable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be enabled (defaults: ${opts[:to_be_enabled]})") { |v|
+      opts[:to_be_enabled] = v.uniq
+    }
+
+    begin
+      args = op.parse(argv)
+      succeed = true
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+      puts e.message
+      puts op.help
+      succeed = false
+    end
+
+    [succeed, opts, args]
+  end
+
+  def run
+    succeed, opts, args = parse_options
+    if succeed
+      puts "- specified feature flags: #{opts.to_s}"
+
+      available_flags = self.available_feature_flags
+      disable_targets = available_flags & opts[:to_be_disabled]
+      enable_targets = available_flags & opts[:to_be_disabled]
+
+      disable_targets.each do |feature|
+        Feature.disable(feature)
+      end
+
+      enable_targets.each do |feature|
+        Feature.enable(feature)
+      end
+
+      invalid_enable_targets = opts[:to_be_enabled] - enable_targets
+      invalid_disable_targets = opts[:to_be_disabled] - disable_targets
+      invalid_targets = invalid_disable_targets | invalid_enable_targets
+      if invalid_targets.length > 0
+        puts "- Following flags are probably invalid and have been ignored: #{invalid_enable_targets.to_a.join(",")}"
+      end
+    end
+
+    Feature.all
+  end
+end
+
+features = FeatureFlagCLI.new.run
+puts features.map { |f|
+  format("- feature %<name>s : %<state>s", name: f.name, state: f.state)
+}
diff --git a/entrypoint.sh b/entrypoint.sh
index c5a4e3536..2f3b15959 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -21,12 +21,12 @@ case ${1} in
         /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf &
         SUPERVISOR_PID=$!
         migrate_database
-        configure_gitlab_requires_db
         kill -15 $SUPERVISOR_PID
         if ps h -p $SUPERVISOR_PID > /dev/null ; then
         wait $SUPERVISOR_PID || true
         fi
         rm -rf /var/run/supervisor.sock
+        configure_gitlab_requires_db
         exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
         ;;
       app:init)

From 351711c4ccbf8ced1438805b3fc2a5cd06a44381 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 22 Mar 2024 18:32:35 +0900
Subject: [PATCH 0937/1124] Simplify message on feature flag target specified
 as reviewed

like below:

````
Configuring gitlab::feature_flags...
- Launching rails runner to set feature flags. This will take some time....
- Specified feature flags  to be disabled:
--- "auto_devops_banner_disabled"
--- "invalid_flag_name"
- Specified feature flags  to be enabled
--- "git_push_create_all_pipelines"
--- "another_invalid_flag_name"
- Following flags are probably invalid and have been ignored
--- invalid_flag_name
--- another_invalid_flag_name
- Apply user defined feature flags:
--- auto_devops_banner_disabled : off
--- git_push_create_all_pipelines : on
````

- Do not `puts` parsed options (formatted by ruby's `.to_s`),
  `puts` each specified target with three hyphens instead
- `puts` each ignored target on each line with three hyphens instead of single line csv
---
 assets/runtime/scripts/configure_feature_flags.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb
index 484cf62ee..90ccd2dce 100644
--- a/assets/runtime/scripts/configure_feature_flags.rb
+++ b/assets/runtime/scripts/configure_feature_flags.rb
@@ -38,9 +38,13 @@ def parse_options(argv = ARGV)
 
     op.on("-d", "--disable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be disabled (defaults: ${opts[:to_be_disabled]})") { |v|
       opts[:to_be_disabled] = v.uniq
+      puts "- Specified feature flags to be disabled"
+      puts opts[:to_be_disabled].map { |f| format("--- %<opt>s", opt: f) }
     }
     op.on("-e", "--enable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be enabled (defaults: ${opts[:to_be_enabled]})") { |v|
       opts[:to_be_enabled] = v.uniq
+      puts "- Specified feature flags to be enabled"
+      puts opts[:to_be_enabled].map { |f| format("--- %<opt>s", opt: f) }
     }
 
     begin
@@ -58,8 +62,6 @@ def parse_options(argv = ARGV)
   def run
     succeed, opts, args = parse_options
     if succeed
-      puts "- specified feature flags: #{opts.to_s}"
-
       available_flags = self.available_feature_flags
       disable_targets = available_flags & opts[:to_be_disabled]
       enable_targets = available_flags & opts[:to_be_disabled]
@@ -76,7 +78,8 @@ def run
       invalid_disable_targets = opts[:to_be_disabled] - disable_targets
       invalid_targets = invalid_disable_targets | invalid_enable_targets
       if invalid_targets.length > 0
-        puts "- Following flags are probably invalid and have been ignored: #{invalid_enable_targets.to_a.join(",")}"
+        puts "- Following flags are probably invalid and have been ignored"
+        puts invalid_targets.map { |f| format("--- %<name>s", name: f) }
       end
     end
 

From b8e299afb96bec62202f9b879b305abc342da0a6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 28 Mar 2024 16:22:48 +0100
Subject: [PATCH 0938/1124] Upgrade GitLab CE to 16.10.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 25a08c61b..300133068 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.10.1**
+
+- gitlab: upgrade CE to v16.10.1
+- gitaly: upgrade to v16.10.1
+- gitlab-pages: upgrade to v16.10.1
+
 **16.10.0**
 
 - gitlab: upgrade CE to v16.10.0
diff --git a/Dockerfile b/Dockerfile
index 65d9a2456..1b8f71c69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240216
 
-ARG VERSION=16.10.0
+ARG VERSION=16.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.1 \
     GITLAB_SHELL_VERSION=14.34.0 \
-    GITLAB_PAGES_VERSION=16.10.0 \
-    GITALY_SERVER_VERSION=16.10.0 \
+    GITLAB_PAGES_VERSION=16.10.1 \
+    GITALY_SERVER_VERSION=16.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 59392261d..b74a3f5df 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.10.0
+# sameersbn/gitlab:16.10.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.0
+docker pull sameersbn/gitlab:16.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.10.0
+ sameersbn/gitlab:16.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.10.0
+    sameersbn/gitlab:16.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:sanitize
+    sameersbn/gitlab:16.10.1 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake db:setup
+    sameersbn/gitlab:16.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.0
+docker pull sameersbn/gitlab:16.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.1
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3027af39c..09df90764 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.10.0
+16.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index aa04d5d35..7d8e4b972 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index cc8c83ea3..380e105e5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 016f5aa54..e51c096f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 45f2b901a..36304bcb5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.0
+docker pull sameersbn/gitlab:16.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.10.0
+sameersbn/gitlab:16.10.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e6cdd48da..e62e8eaf9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6256cad3d..e3ada5fa6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.0
+    image: sameersbn/gitlab:16.10.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6e27c01e3..55269386b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.10.0
+        image: sameersbn/gitlab:16.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From afdb3d50981c128592652f8e3fe01b30dd705122 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 11 Apr 2024 17:41:23 +0200
Subject: [PATCH 0939/1124] Upgrade GitLab CE to 16.10.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 300133068..e6059612f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.10.2**
+
+- gitlab: upgrade CE to v16.10.2
+- gitaly: upgrade to v16.10.2
+- gitlab-pages: upgrade to v16.10.2
+- golang: upgrade to v1.22.2
+
 **16.10.1**
 
 - gitlab: upgrade CE to v16.10.1
diff --git a/Dockerfile b/Dockerfile
index 1b8f71c69..d4b368c82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240216
 
-ARG VERSION=16.10.1
+ARG VERSION=16.10.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
-    GOLANG_VERSION=1.22.1 \
+    GOLANG_VERSION=1.22.2 \
     GITLAB_SHELL_VERSION=14.34.0 \
-    GITLAB_PAGES_VERSION=16.10.1 \
-    GITALY_SERVER_VERSION=16.10.1 \
+    GITLAB_PAGES_VERSION=16.10.2 \
+    GITALY_SERVER_VERSION=16.10.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b74a3f5df..ff8b95fe6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.10.1
+# sameersbn/gitlab:16.10.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.1
+docker pull sameersbn/gitlab:16.10.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.10.1
+ sameersbn/gitlab:16.10.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.10.1
+    sameersbn/gitlab:16.10.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:sanitize
+    sameersbn/gitlab:16.10.2 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake db:setup
+    sameersbn/gitlab:16.10.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.10.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.1
+docker pull sameersbn/gitlab:16.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.2
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 09df90764..0a080902a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.10.1
+16.10.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7d8e4b972..345e9374a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 380e105e5..a41541af3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e51c096f7..d5619900f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 36304bcb5..c70c61caa 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.1
+docker pull sameersbn/gitlab:16.10.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.10.1
+sameersbn/gitlab:16.10.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e62e8eaf9..5e44f1487 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e3ada5fa6..44c6cb558 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.1
+    image: sameersbn/gitlab:16.10.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 55269386b..c3eeab721 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.10.1
+        image: sameersbn/gitlab:16.10.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 18ad32c96215b6f3098f95388aba64c1c1b6a54d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 22 Apr 2024 21:16:16 +0200
Subject: [PATCH 0940/1124] Upgrade GitLab CE to 16.10.3

---
 Changelog.md | 7 +++++++
 Dockerfile   | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e6059612f..31260d467 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.10.3**
+
+- gitlab: upgrade CE to v16.10.3
+- gitaly: upgrade to v16.10.3
+- gitlab-pages: upgrade to v16.10.3
+- ubuntu: upgrade to focal-20240410
+
 **16.10.2**
 
 - gitlab: upgrade CE to v16.10.2
diff --git a/Dockerfile b/Dockerfile
index d4b368c82..a17fb30d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20240216
+FROM ubuntu:focal-20240410
 
-ARG VERSION=16.10.2
+ARG VERSION=16.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.2 \
     GITLAB_SHELL_VERSION=14.34.0 \
-    GITLAB_PAGES_VERSION=16.10.2 \
-    GITALY_SERVER_VERSION=16.10.2 \
+    GITLAB_PAGES_VERSION=16.10.3 \
+    GITALY_SERVER_VERSION=16.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From 6ec7387704f95429fa063f4fd66f986d2f9a2085 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 23 Apr 2024 06:42:08 +0200
Subject: [PATCH 0941/1124] Update version information

---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index ff8b95fe6..b87bcd310 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.10.2
+# sameersbn/gitlab:16.10.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.2
+docker pull sameersbn/gitlab:16.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.10.2
+ sameersbn/gitlab:16.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.10.2
+    sameersbn/gitlab:16.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:sanitize
+    sameersbn/gitlab:16.10.3 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake db:setup
+    sameersbn/gitlab:16.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:env:info
+    sameersbn/gitlab:16.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.10.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.2
+docker pull sameersbn/gitlab:16.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.3
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0a080902a..5c6cfac3e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.10.2
+16.10.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 345e9374a..084012e6d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a41541af3..6bd6b35b1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d5619900f..dc1a1fbc1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c70c61caa..70d68c4d5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.2
+docker pull sameersbn/gitlab:16.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.10.2
+sameersbn/gitlab:16.10.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5e44f1487..1e0d7cb29 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 44c6cb558..cd8f0d0b5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.2
+    image: sameersbn/gitlab:16.10.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c3eeab721..a21eb5daf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.10.2
+        image: sameersbn/gitlab:16.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 9f0a0d268b73f006396d28e5114de7b064511a97 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 23 Apr 2024 16:51:58 +0200
Subject: [PATCH 0942/1124] Upgrade GitLab CE to 16.11.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 31260d467..0252b37d3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.11.0**
+
+- gitlab: upgrade CE to v16.11.0
+- gitaly: upgrade to v16.11.0
+- gitlab-pages: upgrade to v16.11.0
+- gitlab-shell: upgrade to v14.35.0
+
 **16.10.3**
 
 - gitlab: upgrade CE to v16.10.3
diff --git a/Dockerfile b/Dockerfile
index a17fb30d9..32c90d767 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240410
 
-ARG VERSION=16.10.3
+ARG VERSION=16.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.3 \
     RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
     GOLANG_VERSION=1.22.2 \
-    GITLAB_SHELL_VERSION=14.34.0 \
-    GITLAB_PAGES_VERSION=16.10.3 \
-    GITALY_SERVER_VERSION=16.10.3 \
+    GITLAB_SHELL_VERSION=14.35.0 \
+    GITLAB_PAGES_VERSION=16.11.0 \
+    GITALY_SERVER_VERSION=16.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b87bcd310..383ecad7d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.10.3
+# sameersbn/gitlab:16.11.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.3
+docker pull sameersbn/gitlab:16.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.10.3
+ sameersbn/gitlab:16.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.10.3
+    sameersbn/gitlab:16.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:sanitize
+    sameersbn/gitlab:16.11.0 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake db:setup
+    sameersbn/gitlab:16.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:16.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.3
+docker pull sameersbn/gitlab:16.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.0
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5c6cfac3e..c723e938e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.10.3
+16.11.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 084012e6d..011d919c2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6bd6b35b1..a46dad164 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dc1a1fbc1..fe8255ee2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 70d68c4d5..4beda76b7 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.10.3
+docker pull sameersbn/gitlab:16.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.10.3
+sameersbn/gitlab:16.11.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1e0d7cb29..58fd448d7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cd8f0d0b5..0913a2680 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.10.3
+    image: sameersbn/gitlab:16.11.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a21eb5daf..5b558df7a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.10.3
+        image: sameersbn/gitlab:16.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 33e112e8cb34052c52c5ee295e8e77d09b3fbd7a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 26 Apr 2024 22:29:35 +0200
Subject: [PATCH 0943/1124] Upgrade GitLab CE to 16.11.1

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0252b37d3..5f7aed1ed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.11.1**
+
+- gitlab: upgrade CE to v16.11.1
+- gitaly: upgrade to v16.11.1
+- gitlab-pages: upgrade to v16.11.1
+- ruby: upgrade to v3.2.4
+- ubuntu: upgrade to focal-20240416
+
 **16.11.0**
 
 - gitlab: upgrade CE to v16.11.0
diff --git a/Dockerfile b/Dockerfile
index 32c90d767..57bc4426a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20240410
+FROM ubuntu:focal-20240416
 
-ARG VERSION=16.11.0
+ARG VERSION=16.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.3 \
-    RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \
+    RUBY_VERSION=3.2.4 \
+    RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     GOLANG_VERSION=1.22.2 \
     GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=16.11.0 \
-    GITALY_SERVER_VERSION=16.11.0 \
+    GITLAB_PAGES_VERSION=16.11.1 \
+    GITALY_SERVER_VERSION=16.11.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 383ecad7d..5208423de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.11.0
+# sameersbn/gitlab:16.11.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.0
+docker pull sameersbn/gitlab:16.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.11.0
+ sameersbn/gitlab:16.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.11.0
+    sameersbn/gitlab:16.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:sanitize
+    sameersbn/gitlab:16.11.1 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake db:setup
+    sameersbn/gitlab:16.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:16.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.0
+docker pull sameersbn/gitlab:16.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.1
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c723e938e..141e9a2a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.11.0
+16.11.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 011d919c2..247411923 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a46dad164..e8b62533b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index fe8255ee2..99108b7a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4beda76b7..618e01ef1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.0
+docker pull sameersbn/gitlab:16.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.11.0
+sameersbn/gitlab:16.11.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 58fd448d7..17a6dff27 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0913a2680..ff050ffc0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.0
+    image: sameersbn/gitlab:16.11.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5b558df7a..0ccd9950b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.11.0
+        image: sameersbn/gitlab:16.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From ab5faa4a6c842a5e45925e9cdaf65b4be791f33d Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Mon, 29 Apr 2024 10:21:21 +0100
Subject: [PATCH 0944/1124] Update redis image to use latest patch and not a
 hardcoded patch

Current latest patch is 6.2.14
---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docker-compose.swarm.yml                | 2 +-
 docker-compose.yml                      | 2 +-
 docs/docker-compose-keycloak.yml        | 2 +-
 docs/docker-compose-registry.yml        | 2 +-
 kubernetes/redis-rc.yml                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 247411923..4760ca6f2 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: redis:6.2.6
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e8b62533b..bf550131c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   redis:
-    image: redis:6.2.6
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 99108b7a6..7e24c771c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:6.2.6
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 17a6dff27..20976a6fb 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2.6
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ff050ffc0..40f30c3d4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2.6
+    image: redis:6.2
     command:
     - --loglevel warning
     volumes:
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index be3351246..b42b387b4 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: redis:6.2.6
+        image: redis:6.2
         ports:
         - name: redis
           containerPort: 6379

From c9973b4ba6b97584138bf8395f64cd6d83b566fa Mon Sep 17 00:00:00 2001
From: Filipe Roque <froque@premium-minds.com>
Date: Tue, 30 Apr 2024 09:26:00 +0100
Subject: [PATCH 0945/1124] Fix recompile spelling

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4a3759a68..8c6aad290 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2221,7 +2221,7 @@ migrate_database() {
         mkdir -p ${GITLAB_HOME}/gitlab/node_modules
         chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
       fi
-      echo "Prepare recomplie assets... Installing missing node_modules for assets"
+      echo "Prepare recompile assets... Installing missing node_modules for assets"
       chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
       exec_as_git yarn install --production --pure-lockfile
       echo "Recompiling assets (relative_url in use), this could take a while..."

From f2e5c71294133edf99b7160fd15ba6aa976a7b58 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 9 May 2024 00:06:44 +0200
Subject: [PATCH 0946/1124] Upgrade GitLab CE to 16.11.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5f7aed1ed..34814eeb6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**16.11.2**
+
+- gitlab: upgrade CE to v16.11.2
+- gitaly: upgrade to v16.11.2
+- gitlab-pages: upgrade to v16.11.2
+- golang: upgrade to v1.223
+- ubuntu: upgrade to focal-20240427
+
 **16.11.1**
 
 - gitlab: upgrade CE to v16.11.1
diff --git a/Dockerfile b/Dockerfile
index 57bc4426a..50b1b1355 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20240416
+FROM ubuntu:focal-20240427
 
-ARG VERSION=16.11.1
+ARG VERSION=16.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
-    GOLANG_VERSION=1.22.2 \
+    GOLANG_VERSION=1.22.3 \
     GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=16.11.1 \
-    GITALY_SERVER_VERSION=16.11.1 \
+    GITLAB_PAGES_VERSION=16.11.2 \
+    GITALY_SERVER_VERSION=16.11.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5208423de..5fb83ef77 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.11.1
+# sameersbn/gitlab:16.11.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.1
+docker pull sameersbn/gitlab:16.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.11.1
+ sameersbn/gitlab:16.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.11.1
+    sameersbn/gitlab:16.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:sanitize
+    sameersbn/gitlab:16.11.2 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake db:setup
+    sameersbn/gitlab:16.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:16.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:16.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.1
+docker pull sameersbn/gitlab:16.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.2
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 141e9a2a2..746cb1a5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.11.1
+16.11.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4760ca6f2..7ffccb110 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index bf550131c..698185020 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e24c771c..84acbe55a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 618e01ef1..1fa8bad10 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.1
+docker pull sameersbn/gitlab:16.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.11.1
+sameersbn/gitlab:16.11.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 20976a6fb..a258ce03e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 40f30c3d4..6bf213b1d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.1
+    image: sameersbn/gitlab:16.11.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0ccd9950b..5fe09e8b6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.11.1
+        image: sameersbn/gitlab:16.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 544d17841f933966a6e3cf0950ebe2ca4fb367f6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 19 May 2024 21:28:47 +0200
Subject: [PATCH 0947/1124] Upgrade GitLab CE to 17.0.0

---
 Changelog.md                            |  9 ++++-
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 34814eeb6..4de154180 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,12 +2,19 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.0.0**
+
+- gitlab: upgrade CE to v17.0.0
+- gitaly: upgrade to v17.0.0
+- gitlab-pages: upgrade to v17.0.0
+- gitlab-shell: upgrade to v14.35.0
+
 **16.11.2**
 
 - gitlab: upgrade CE to v16.11.2
 - gitaly: upgrade to v16.11.2
 - gitlab-pages: upgrade to v16.11.2
-- golang: upgrade to v1.223
+- golang: upgrade to v1.22.3
 - ubuntu: upgrade to focal-20240427
 
 **16.11.1**
diff --git a/Dockerfile b/Dockerfile
index 50b1b1355..45eb1acff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240427
 
-ARG VERSION=16.11.2
+ARG VERSION=17.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     GOLANG_VERSION=1.22.3 \
     GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=16.11.2 \
-    GITALY_SERVER_VERSION=16.11.2 \
+    GITLAB_PAGES_VERSION=17.0.0 \
+    GITALY_SERVER_VERSION=17.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5fb83ef77..57f9e48c0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:16.11.2
+# sameersbn/gitlab:17.0.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.2
+docker pull sameersbn/gitlab:17.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:16.11.2
+ sameersbn/gitlab:17.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:16.11.2
+    sameersbn/gitlab:17.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:sanitize
+    sameersbn/gitlab:17.0.0 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake db:setup
+    sameersbn/gitlab:17.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:16.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.2
+docker pull sameersbn/gitlab:17.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.0
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 746cb1a5b..aac58983e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.11.2
+17.0.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 7ffccb110..5d33f1d26 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 698185020..6c21a2853 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 84acbe55a..376d3c9f8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1fa8bad10..73628ce9d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:16.11.2
+docker pull sameersbn/gitlab:17.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:16.11.2
+sameersbn/gitlab:17.0.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a258ce03e..1a4f572e3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6bf213b1d..30e35d408 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:16.11.2
+    image: sameersbn/gitlab:17.0.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 5fe09e8b6..1e166b7e1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:16.11.2
+        image: sameersbn/gitlab:17.0.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 07db6ad5fab967d81213e8080ee056444e479db6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 24 May 2024 17:55:42 +0200
Subject: [PATCH 0948/1124] Upgrade GitLab CE to 17.0.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4de154180..ce7616db5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.0.1**
+
+- gitlab: upgrade CE to v17.0.1
+- gitaly: upgrade to v17.0.1
+- gitlab-pages: upgrade to v17.0.1
+
 **17.0.0**
 
 - gitlab: upgrade CE to v17.0.0
diff --git a/Dockerfile b/Dockerfile
index 45eb1acff..966e7f38f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:focal-20240427
 
-ARG VERSION=17.0.0
+ARG VERSION=17.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     GOLANG_VERSION=1.22.3 \
     GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=17.0.0 \
-    GITALY_SERVER_VERSION=17.0.0 \
+    GITLAB_PAGES_VERSION=17.0.1 \
+    GITALY_SERVER_VERSION=17.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 57f9e48c0..aa990f09f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.0.0
+# sameersbn/gitlab:17.0.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.0
+docker pull sameersbn/gitlab:17.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.0.0
+ sameersbn/gitlab:17.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.0.0
+    sameersbn/gitlab:17.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:sanitize
+    sameersbn/gitlab:17.0.1 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake db:setup
+    sameersbn/gitlab:17.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.0
+docker pull sameersbn/gitlab:17.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.1
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index aac58983e..3e17df028 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.0
+17.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5d33f1d26..0dc5f9b3c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6c21a2853..f2336334c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 376d3c9f8..195b951e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 73628ce9d..fd2dd9149 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.0
+docker pull sameersbn/gitlab:17.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.0.0
+sameersbn/gitlab:17.0.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1a4f572e3..cc34a3f1a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 30e35d408..1112ec87c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.0
+    image: sameersbn/gitlab:17.0.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1e166b7e1..b03ca8d4f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.0.0
+        image: sameersbn/gitlab:17.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 5204971ce003f5c0ce6b1c06b533b5cf9a0dd53f Mon Sep 17 00:00:00 2001
From: Yannis Mazzer <yannis@datailor.fr>
Date: Mon, 5 Sep 2022 11:13:53 +0200
Subject: [PATCH 0949/1124] #2420 Handle encrypted_settings_key_base variable
 to allow restoring backups from gitlab instances not running from this image
 and using encrypted settings feature.

---
 README.md                                  | 9 ++++++++-
 assets/runtime/config/gitlabhq/secrets.yml | 1 +
 assets/runtime/env-defaults                | 1 +
 assets/runtime/functions                   | 3 ++-
 contrib/docker-swarm/docker-compose.yml    | 1 +
 docker-compose.swarm.yml                   | 1 +
 docs/docker-compose-keycloak.yml           | 1 +
 docs/docker-compose-registry.yml           | 1 +
 docs/docker-swarm-traefik-registry.md      | 1 +
 docs/s3_compatible_storage.md              | 1 +
 kubernetes/gitlab-rc.yml                   | 2 ++
 11 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aa990f09f..fe5d50757 100644
--- a/README.md
+++ b/README.md
@@ -149,11 +149,12 @@ The quickest way to get started is using [docker-compose](https://docs.docker.co
 wget https://raw.githubusercontent.com/sameersbn/docker-gitlab/master/docker-compose.yml
 ```
 
-Generate random strings that are at least `64` characters long for each of `GITLAB_SECRETS_OTP_KEY_BASE`, `GITLAB_SECRETS_DB_KEY_BASE`, and `GITLAB_SECRETS_SECRET_KEY_BASE`. These values are used for the following:
+Generate random strings that are at least `64` characters long for each of `GITLAB_SECRETS_OTP_KEY_BASE`, `GITLAB_SECRETS_DB_KEY_BASE`, `GITLAB_SECRETS_SECRET_KEY_BASE`, `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE`. These values are used for the following:
 
 - `GITLAB_SECRETS_OTP_KEY_BASE` is used to encrypt 2FA secrets in the database. If you lose or rotate this secret, none of your users will be able to log in using 2FA.
 - `GITLAB_SECRETS_DB_KEY_BASE` is used to encrypt CI secret variables, as well as import credentials, in the database. If you lose or rotate this secret, you will not be able to use existing CI secrets.
 - `GITLAB_SECRETS_SECRET_KEY_BASE` is used for password reset links, and other 'standard' auth features. If you lose or rotate this secret, password reset tokens in emails will reset.
+- `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` is used for reading settings from encrypted files such as SMTP or LDAP credentials.
 
 > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`.
 
@@ -194,6 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
+    --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
     sameersbn/gitlab:17.0.1
 ```
@@ -886,6 +888,10 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte
 
  Encryption key for OTP related stuff with  GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults.
 
+##### `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE`
+
+ Encryption key for encrypted settings related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, encrypted settings will not work and might cause errors in merge requests and so on** You can generate one using `pwgen -Bsv1 64`. No defaults.
+
 ##### `GITLAB_TIMEZONE`
 
 Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ`
@@ -2726,6 +2732,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 
 > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
+> **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
 docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.1
diff --git a/assets/runtime/config/gitlabhq/secrets.yml b/assets/runtime/config/gitlabhq/secrets.yml
index 769d956a2..eae882dca 100644
--- a/assets/runtime/config/gitlabhq/secrets.yml
+++ b/assets/runtime/config/gitlabhq/secrets.yml
@@ -6,6 +6,7 @@ production:
   db_key_base: {{GITLAB_SECRETS_DB_KEY_BASE}}
   secret_key_base: {{GITLAB_SECRETS_SECRET_KEY_BASE}}
   otp_key_base: {{GITLAB_SECRETS_OTP_KEY_BASE}}
+  encrypted_settings_key_base: {{GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE}}
 
 development:
   db_key_base: development
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 86e0bd833..2484a1429 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -254,6 +254,7 @@ GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com}
 GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-}
 GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-}
 GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-}
+GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=${GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE:-}
 GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
 GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8c6aad290..5a24e9bc1 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -858,7 +858,8 @@ gitlab_configure_secrets() {
   update_template ${GITLAB_SECRETS_CONFIG} \
   GITLAB_SECRETS_DB_KEY_BASE \
   GITLAB_SECRETS_SECRET_KEY_BASE \
-  GITLAB_SECRETS_OTP_KEY_BASE
+  GITLAB_SECRETS_OTP_KEY_BASE \
+  GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE
 
   local shell_secret="${GITLAB_INSTALL_DIR}/.gitlab_shell_secret"
   if [[ ! -f "${shell_secret}" ]]; then
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0dc5f9b3c..4ec1365bd 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -61,6 +61,7 @@ services:
     - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
 
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f2336334c..a3c462439 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -123,6 +123,7 @@ services:
     - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
 
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cc34a3f1a..b12fdb479 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -57,6 +57,7 @@ services:
     - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
 
     - GITLAB_ROOT_PASSWORD=<root-password>
     - GITLAB_ROOT_EMAIL=
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1112ec87c..a6984ef62 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -58,6 +58,7 @@ services:
     - GITLAB_SECRETS_DB_KEY_BASE=secret
     - GITLAB_SECRETS_SECRET_KEY_BASE=secret
     - GITLAB_SECRETS_OTP_KEY_BASE=secret
+    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret
 
     - GITLAB_REGISTRY_ENABLED=true
     - GITLAB_REGISTRY_HOST=registry.example.com
diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md
index 7f941efba..62384b64d 100644
--- a/docs/docker-swarm-traefik-registry.md
+++ b/docs/docker-swarm-traefik-registry.md
@@ -151,6 +151,7 @@ You can copy it and set it in the file like:
 - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
 - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
 - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+- GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
 ```
 
 There are several other settings that you might want to configure, like email accounts for notifications, SMTP credentials to send emails, etc.
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index b6e9f3db8..ca281b709 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -122,6 +122,7 @@ services:
     - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
     - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b03ca8d4f..d2cf16297 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -27,6 +27,8 @@ spec:
           value: long-and-random-alpha-numeric-string
         - name: GITLAB_SECRETS_OTP_KEY_BASE
           value: long-and-random-alpha-numeric-string
+        - name: GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE
+          value: long-and-random-alpha-numeric-string
 
         - name: GITLAB_ROOT_PASSWORD
           value:

From 0ddf45a5283c9301f40d1811fb441c748e0f44f8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 13 Jun 2024 20:11:10 +0200
Subject: [PATCH 0950/1124] Upgrade GitLab CE to 17.0.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ce7616db5..2065b58e6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.0.2**
+
+- gitlab: upgrade CE to v17.0.2
+- gitaly: upgrade to v17.0.2
+- gitlab-pages: upgrade to v17.0.2
+- golang: upgrade to v1.22.4
+- ubuntu: upgrade to focal-20240530
+
 **17.0.1**
 
 - gitlab: upgrade CE to v17.0.1
diff --git a/Dockerfile b/Dockerfile
index 966e7f38f..a746c8756 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:focal-20240427
+FROM ubuntu:focal-20240530
 
-ARG VERSION=17.0.1
+ARG VERSION=17.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
-    GOLANG_VERSION=1.22.3 \
+    GOLANG_VERSION=1.22.4 \
     GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=17.0.1 \
-    GITALY_SERVER_VERSION=17.0.1 \
+    GITLAB_PAGES_VERSION=17.0.2 \
+    GITALY_SERVER_VERSION=17.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index aa990f09f..c66d93fb7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.0.1
+# sameersbn/gitlab:17.0.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.1
+docker pull sameersbn/gitlab:17.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -195,7 +195,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -230,7 +230,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 ### Database
@@ -288,7 +288,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -332,7 +332,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -371,7 +371,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 #### Linking to Redis Container
@@ -398,7 +398,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 #### Mail
@@ -411,7 +411,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -431,7 +431,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -515,7 +515,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -531,7 +531,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.0.1
+ sameersbn/gitlab:17.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -554,7 +554,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -602,7 +602,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -784,14 +784,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.0.1
+    sameersbn/gitlab:17.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:sanitize
+    sameersbn/gitlab:17.0.2 app:sanitize
 ```
 
 #### Piwik
@@ -2530,7 +2530,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2565,14 +2565,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake db:setup
+    sameersbn/gitlab:17.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2630,7 +2630,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.1
+docker pull sameersbn/gitlab:17.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2728,7 +2728,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.2
 ```
 
 ### Shell Access
@@ -2766,7 +2766,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3e17df028..c57cf9a9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.1
+17.0.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0dc5f9b3c..87eb3efad 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index f2336334c..a44999e5c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 195b951e0..7be086aac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fd2dd9149..35c99848d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.1
+docker pull sameersbn/gitlab:17.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.0.1
+sameersbn/gitlab:17.0.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cc34a3f1a..091797361 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1112ec87c..42639f8d1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.1
+    image: sameersbn/gitlab:17.0.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b03ca8d4f..b7f3122c5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.0.1
+        image: sameersbn/gitlab:17.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From f30613b19229c96f959c69204420a699ee0d67a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moln=C3=A1r=20P=C3=A9ter?= <molnarp@niif.hu>
Date: Tue, 18 Jun 2024 21:37:37 +0200
Subject: [PATCH 0951/1124] Add support for Omniauth OpenID Connect login.

---
 README.md                                 | 25 +++++++++++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml | 17 ++++++++++++++
 assets/runtime/env-defaults               | 22 ++++++++++++++++++
 assets/runtime/functions                  | 27 ++++++++++++++++++++++-
 4 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f46aa79d0..a8e871a1c 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@
         - [Crowd](#crowd)
         - [Microsoft Azure](#microsoft-azure)
         - [Generic OAuth2](#Generic-OAuth2)
+        - [OpenID Connect](#OpenID-Connect)
     - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
@@ -725,6 +726,30 @@ As an example this code has been tested with Keycloak, with the following variab
 
 See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details.
 
+##### OpenID Connect
+
+To enable OpenID Connect provider, you must register your application with your provider. You also need to confirm OpenID Connect provider app's ID and secret, the client options and the user's response structure.
+
+To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`.
+
+| GitLab setting | environment variable |
+|----------------|----------------------|
+| `label` | `OAUTH_OIDC_LABEL` |
+| `icon` | `OAUTH_OIDC_ICON` |
+| `scope`| `OAUTH_OIDC_SCOPE` |
+| `response_type` | `OAUTH_OIDC_RESPONSE_TYPE` |
+| `issuer` | `OAUTH_OIDC_ISSUER` |
+| `discovery` | `OAUTH_OIDC_DISCOVERY` |
+| `client_auth_method` | `OAUTH_OIDC_CLIENT_AUTH_METHOD` |
+| `uid_field` | `OAUTH_OIDC_UID_FIELD` |
+| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` |
+| `pkce` | `OAUTH_OIDC_PKCE` |
+| `client_options.identifier` | `OAUTH_OIDC_CLIENT_ID` |
+| `client_options.secret` | `OAUTH_OIDC_CLIENT_SECRET` |
+| `client_options.redirect_uri` | `OAUTH_OIDC_REDIRECT_URI` |
+
+See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/).
+
 #### Gitlab Pages
 
 Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 226ced2e8..f828dd6f5 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -1031,6 +1031,23 @@ production: &base
             client_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID}}',
             client_secret: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET}}',
             tenant_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}' } }
+      - { name: 'openid_connect',
+          label: '{{OAUTH_OIDC_LABEL}}',
+          icon: '{{OAUTH_OIDC_ICON}}',
+          args: {
+            name: 'openid_connect',
+            scope: {{OAUTH_OIDC_SCOPE}},
+            response_type: '{{OAUTH_OIDC_RESPONSE_TYPE}}',
+            issuer: '{{OAUTH_OIDC_ISSUER}}',
+            discovery: {{OAUTH_OIDC_DISCOVERY}},
+            client_auth_method: '{{OAUTH_OIDC_CLIENT_AUTH_METHOD}}',
+            uid_field: '{{OAUTH_OIDC_UID_FIELD}}',
+            send_scope_to_token_endpoint: {{OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP}},
+            pkce: {{OAUTH_OIDC_PKCE}},
+            client_options: {
+              identifier: '{{OAUTH_OIDC_CLIENT_ID}}',
+              secret: '{{OAUTH_OIDC_CLIENT_SECRET}}',
+              redirect_uri: '{{OAUTH_OIDC_REDIRECT_URI}}' } } }
 
     # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
     # cas3:
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 2484a1429..8b2e256be 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -537,6 +537,28 @@ OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=${OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE:-}
 OAUTH2_GENERIC_LABEL=${OAUTH2_GENERIC_LABEL:-}
 OAUTH2_GENERIC_NAME=${OAUTH2_GENERIC_NAME:-}
 
+### OpenID Connect
+OAUTH_OIDC_LABEL=${OAUTH_OIDC_LABEL:-'OpenID Connect'}
+OAUTH_OIDC_ICON=${OAUTH_OIDC_ICON:-}
+OAUTH_OIDC_SCOPE=${OAUTH_OIDC_SCOPE:-"['openid','profile','email']"}
+OAUTH_OIDC_RESPONSE_TYPE=${OAUTH_OIDC_RESPONSE_TYPE:-'code'}
+OAUTH_OIDC_ISSUER=${OAUTH_OIDC_ISSUER:-}
+OAUTH_OIDC_DISCOVERY=${OAUTH_OIDC_DISCOVERY:-true}
+OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'query'}
+OAUTH_OIDC_UID_FIELD=${OAUTH_OIDC_UID_FIELD:-sub}
+OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP=${OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP:-false}
+OAUTH_OIDC_PKCE=${OAUTH_OIDC_PKCE:-true}
+OAUTH_OIDC_CLIENT_ID=${OAUTH_OIDC_CLIENT_ID:-}
+OAUTH_OIDC_CLIENT_SECRET=${OAUTH_OIDC_CLIENT_SECRET:-'secret'}
+case $GITLAB_HTTPS in
+  true)
+    OAUTH_OIDC_REDIRECT_URI=${OAUTH_OIDC_REDIRECT_URI:-https://${GITLAB_HOST}/users/auth/openid_connect/callback}
+    ;;
+  false)
+    OAUTH_OIDC_REDIRECT_URI=${OAUTH_OIDC_REDIRECT_URI:-http://${GITLAB_HOST}/users/auth/openid_connect/callback}
+    ;;
+esac
+
 ## ANALYTICS
 
 ### GOOGLE
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5a24e9bc1..b23d6f461 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -793,6 +793,30 @@ gitlab_configure_oauth_azure_ad_v2() {
   fi
 }
 
+gitlab_configure_oauth_oidc() {
+  if [[ -n ${OAUTH_OIDC_ISSUER} && \
+        -n ${OAUTH_OIDC_CLIENT_ID} ]]; then
+    echo "Configuring gitlab::oauth::oidc..."
+    OAUTH_ENABLED=${OAUTH_ENABLED:-true}
+    update_template ${GITLAB_CONFIG} \
+      OAUTH_OIDC_LABEL \
+      OAUTH_OIDC_ICON \
+      OAUTH_OIDC_SCOPE \
+      OAUTH_OIDC_RESPONSE_TYPE \
+      OAUTH_OIDC_ISSUER \
+      OAUTH_OIDC_DISCOVERY \
+      OAUTH_OIDC_CLIENT_AUTH_METHOD \
+      OAUTH_OIDC_UID_FIELD \
+      OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP \
+      OAUTH_OIDC_PKCE \
+      OAUTH_OIDC_CLIENT_ID \
+      OAUTH_OIDC_CLIENT_SECRET \
+      OAUTH_OIDC_REDIRECT_URI
+  else
+    exec_as_git sed -i "/name: 'openid_connect'/,/{{OAUTH_OIDC_REDIRECT_URI}}/d" ${GITLAB_CONFIG}
+  fi
+}
+
 gitlab_configure_oauth() {
   echo "Configuring gitlab::oauth..."
 
@@ -810,6 +834,7 @@ gitlab_configure_oauth() {
   gitlab_configure_oauth_auth0
   gitlab_configure_oauth_azure
   gitlab_configure_oauth_azure_ad_v2
+  gitlab_configure_oauth_oidc
 
   OAUTH_ENABLED=${OAUTH_ENABLED:-false}
   update_template ${GITLAB_CONFIG} \
@@ -823,7 +848,7 @@ gitlab_configure_oauth() {
     OAUTH_ALLOW_BYPASS_TWO_FACTOR
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
-    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME)
+    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc)
       update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER
       ;;
     *)

From de8d0d52a9749f83c42115f2b71f2a9bbc0604b3 Mon Sep 17 00:00:00 2001
From: molnarpe <peter@molnar-peter.hu>
Date: Wed, 19 Jun 2024 15:25:46 +0200
Subject: [PATCH 0952/1124] Update env-defaults

Value for client_auth_method is 'query' in the example, but default value is 'basic' as described in [GitLab OmniAuth OIDC documentation, step 4.](https://docs.gitlab.com/ee/administration/auth/oidc.html).
---
 assets/runtime/env-defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 8b2e256be..7c6de6d97 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -544,7 +544,7 @@ OAUTH_OIDC_SCOPE=${OAUTH_OIDC_SCOPE:-"['openid','profile','email']"}
 OAUTH_OIDC_RESPONSE_TYPE=${OAUTH_OIDC_RESPONSE_TYPE:-'code'}
 OAUTH_OIDC_ISSUER=${OAUTH_OIDC_ISSUER:-}
 OAUTH_OIDC_DISCOVERY=${OAUTH_OIDC_DISCOVERY:-true}
-OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'query'}
+OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'basic'}
 OAUTH_OIDC_UID_FIELD=${OAUTH_OIDC_UID_FIELD:-sub}
 OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP=${OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP:-false}
 OAUTH_OIDC_PKCE=${OAUTH_OIDC_PKCE:-true}

From f647f3b058feaa9a14db404ef5e10fd69bf616ed Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 15 Jun 2024 11:59:49 +0900
Subject: [PATCH 0953/1124] Upgrade nodejs apt source repo from 18.x to 20.x

Required version is updated from v18.16.x to v20.13.x
with GitLab v17.0.0 release.

Documentation:
- "Bump required Node.js version to 20 in installation guide"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154523

.tool-versions:
- "Update .tool-versions and .nvmrc to use nodejs v20.12.2"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149615

- Set distro to "nodistro" for nodejs to get later updates

GitLab v17.0.0 or later requires (grants) nodejs v20.13.x or later,
but nodejs v20.5.1 is installed for focal even later LTS are released.
To avoid this issue, official installer script uses "nodistro"
instead of specific distribution.

See:
https://github.com/nodesource/distributions/blob/83867e0fdde8ebb17f5f83644f00c4bb180a4568/scripts/deb/setup_20.x#L74
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a746c8756..f4ef78225 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex && \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_18.x focal main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && set -ex \

From d3501eb023527966873893ea819e398ee7a23ec9 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 21 Jun 2024 19:44:29 +0900
Subject: [PATCH 0954/1124] Update gpg key source for nodejs

as original one caused following error:

    W: GPG error: https://deb.nodesource.com/node_20.x nodistro InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 2F59B5F99B1BE0B4
    E: The repository 'https://deb.nodesource.com/node_20.x nodistro InRelease' is not signed.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f4ef78225..392bc49b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex && \
  && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
- && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \
  && echo 'deb https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
  && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \

From 3c0be758cb3aed0b9f1ac2e8f7eea30fa7aaef21 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 15 Jun 2024 11:59:25 +0900
Subject: [PATCH 0955/1124] Add ENV RUBYGEMS_VERSION and set to latest 3.5.x

that is GitLab v17.0 recommendation

MR that updates docs/install/installation.md:
- "Bump version of rubygems in installation instructions"
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149976

There is no entry in .tools-version
---
 Dockerfile              | 1 +
 assets/build/install.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index a746c8756..a29ea8046 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ ARG VERSION=17.0.2
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
+    RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.22.4 \
     GITLAB_SHELL_VERSION=14.35.0 \
     GITLAB_PAGES_VERSION=17.0.2 \
diff --git a/assets/build/install.sh b/assets/build/install.sh
index 31a23b691..47fc46202 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -56,6 +56,9 @@ make -j"$(nproc)"
 make install
 cd "$PWD_ORG" && rm -rf /tmp/ruby
 
+# upgrade rubygems on demand
+gem update --no-document --system "${RUBYGEMS_VERSION}"
+
 # PaX-mark ruby
 # Applying the mark late here does make the build usable on PaX kernels, but
 # still the build itself must be executed on a non-PaX kernel. It's done here

From eeedd79a003ded408cd3bd84633cb01dd6c6614c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 21 Jun 2024 21:18:51 +0200
Subject: [PATCH 0956/1124] Upgrade GitLab CE to 17.1.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2065b58e6..3d0bdfdc6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.1.0**
+
+- gitlab: upgrade CE to v17.1.0
+- gitaly: upgrade to v17.1.0
+- gitlab-pages: upgrade to v17.1.0
+- gitlab-shell: upgrade to v14.36.0
+
 **17.0.2**
 
 - gitlab: upgrade CE to v17.0.2
diff --git a/Dockerfile b/Dockerfile
index ae245443f..2d919ba27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.0.2
+ARG VERSION=17.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.22.4 \
-    GITLAB_SHELL_VERSION=14.35.0 \
-    GITLAB_PAGES_VERSION=17.0.2 \
-    GITALY_SERVER_VERSION=17.0.2 \
+    GITLAB_SHELL_VERSION=14.36.0 \
+    GITLAB_PAGES_VERSION=17.1.0 \
+    GITALY_SERVER_VERSION=17.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f46aa79d0..66dc6b3d0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.0.2
+# sameersbn/gitlab:17.1.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.2
+docker pull sameersbn/gitlab:17.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 ### Database
@@ -290,7 +290,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -334,7 +334,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -373,7 +373,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 #### Linking to Redis Container
@@ -400,7 +400,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 #### Mail
@@ -413,7 +413,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -433,7 +433,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -517,7 +517,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -533,7 +533,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.0.2
+ sameersbn/gitlab:17.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -556,7 +556,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -604,7 +604,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -786,14 +786,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.0.2
+    sameersbn/gitlab:17.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:sanitize
+    sameersbn/gitlab:17.1.0 app:sanitize
 ```
 
 #### Piwik
@@ -2536,7 +2536,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2571,14 +2571,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake db:setup
+    sameersbn/gitlab:17.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2636,7 +2636,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.2
+docker pull sameersbn/gitlab:17.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.0
 ```
 
 ### Shell Access
@@ -2773,7 +2773,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c57cf9a9d..d9e58927a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.2
+17.1.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b5d8fbdd8..5337b9fd7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 05a250b0f..6384484fc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7be086aac..c0e526765 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 35c99848d..8e0f232eb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.0.2
+docker pull sameersbn/gitlab:17.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.0.2
+sameersbn/gitlab:17.1.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cf868d3c6..3e36dd0c6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f7fc213e2..2a2640ea5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.0.2
+    image: sameersbn/gitlab:17.1.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index eaa4097df..f550ddfaf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.0.2
+        image: sameersbn/gitlab:17.1.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8b477f07c15d6cebcd383bef70ed4737f039a6d2 Mon Sep 17 00:00:00 2001
From: molnarpe <peter@molnar-peter.hu>
Date: Sun, 23 Jun 2024 07:02:15 +0200
Subject: [PATCH 0957/1124] Default values for OmniAuth OpenID Connect
 environment variables are now listed in README.md.

---
 README.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index a8e871a1c..0d4f5af30 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
         - [Crowd](#crowd)
         - [Microsoft Azure](#microsoft-azure)
         - [Generic OAuth2](#Generic-OAuth2)
-        - [OpenID Connect](#OpenID-Connect)
+        - [OpenID Connect](#openid-connect)
     - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
@@ -732,21 +732,21 @@ To enable OpenID Connect provider, you must register your application with your
 
 To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`.
 
-| GitLab setting | environment variable |
-|----------------|----------------------|
-| `label` | `OAUTH_OIDC_LABEL` |
-| `icon` | `OAUTH_OIDC_ICON` |
-| `scope`| `OAUTH_OIDC_SCOPE` |
-| `response_type` | `OAUTH_OIDC_RESPONSE_TYPE` |
-| `issuer` | `OAUTH_OIDC_ISSUER` |
-| `discovery` | `OAUTH_OIDC_DISCOVERY` |
-| `client_auth_method` | `OAUTH_OIDC_CLIENT_AUTH_METHOD` |
-| `uid_field` | `OAUTH_OIDC_UID_FIELD` |
-| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` |
-| `pkce` | `OAUTH_OIDC_PKCE` |
-| `client_options.identifier` | `OAUTH_OIDC_CLIENT_ID` |
-| `client_options.secret` | `OAUTH_OIDC_CLIENT_SECRET` |
-| `client_options.redirect_uri` | `OAUTH_OIDC_REDIRECT_URI` |
+| GitLab setting                 | environment variable                | default value                  |
+|--------------------------------|-------------------------------------|--------------------------------|
+| `label`                        | `OAUTH_OIDC_LABEL`                  | `OpenID Connect`               |
+| `icon`                         | `OAUTH_OIDC_ICON`                   |                                |
+| `scope`                        | `OAUTH_OIDC_SCOPE`                  | `['openid','profile','email']` |
+| `response_type`                | `OAUTH_OIDC_RESPONSE_TYPE`          | `code`                         |
+| `issuer`                       | `OAUTH_OIDC_ISSUER`                 |                                |
+| `discovery`                    | `OAUTH_OIDC_DISCOVERY`              | `true`                         |
+| `client_auth_method`           | `OAUTH_OIDC_CLIENT_AUTH_METHOD`     | `basic`                        |
+| `uid_field`                    | `OAUTH_OIDC_UID_FIELD`              | `sub`                          |
+| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` | `false`                        |
+| `pkce`                         | `OAUTH_OIDC_PKCE`                   | `true`                         |
+| `client_options.identifier`    | `OAUTH_OIDC_CLIENT_ID`              |                                |
+| `client_options.secret`        | `OAUTH_OIDC_CLIENT_SECRET`          | `secret`                       |
+| `client_options.redirect_uri`  | `OAUTH_OIDC_REDIRECT_URI`           | `http://${GITLAB_HOST}/users/auth/openid_connect/callback` or `https://${GITLAB_HOST}/users/auth/openid_connect/callback` depending on the value of `GITLAB_HTTPS` |
 
 See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/).
 

From a5ef262bf0dcaae8af598aaa50b010b37a1bdf78 Mon Sep 17 00:00:00 2001
From: Patrick Remy <remy@divera.gmbh>
Date: Thu, 27 Jun 2024 08:39:51 +0200
Subject: [PATCH 0958/1124] Upgrade GitLab CE to 17.1.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 72 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++--
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3d0bdfdc6..24409abc3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.1.1**
+
+- gitlab: upgrade CE to v17.1.1
+- gitaly: upgrade to v17.1.1
+- gitlab-pages: upgrade to v17.1.1
+
 **17.1.0**
 
 - gitlab: upgrade CE to v17.1.0
diff --git a/Dockerfile b/Dockerfile
index 2d919ba27..41a7e0e71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.1.0
+ARG VERSION=17.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.22.4 \
     GITLAB_SHELL_VERSION=14.36.0 \
-    GITLAB_PAGES_VERSION=17.1.0 \
-    GITALY_SERVER_VERSION=17.1.0 \
+    GITLAB_PAGES_VERSION=17.1.1 \
+    GITALY_SERVER_VERSION=17.1.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 66dc6b3d0..2a3d4febe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.1.0
+# sameersbn/gitlab:17.1.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.0
+docker pull sameersbn/gitlab:17.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 ### Database
@@ -290,7 +290,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -334,7 +334,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -373,7 +373,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 #### Linking to Redis Container
@@ -400,7 +400,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 #### Mail
@@ -413,7 +413,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -433,7 +433,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -517,7 +517,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -533,7 +533,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.1.0
+ sameersbn/gitlab:17.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -556,7 +556,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -604,7 +604,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -786,14 +786,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.1.0
+    sameersbn/gitlab:17.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:sanitize
+    sameersbn/gitlab:17.1.1 app:sanitize
 ```
 
 #### Piwik
@@ -808,10 +808,10 @@ These options should contain something like:
 
 In this section, we talk about feature flags that administrators can change the state (See <https://docs.gitlab.com/ee/administration/feature_flags.html>). If you are looking for documentation for "Feature flags" that configured on project deploy settings, see <https://docs.gitlab.com/ee/operations/feature_flags.html>
 
-GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source).  
-You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>  
+GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source).
+You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>
 
-For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods.  
+For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods.
 This image searches yml files in [`${GITLAB_INSTALL_DIR}/config/feature_flags`](https://gitlab.com/gitlab-org/gitlab-foss/-/tree/master/config/feature_flags) (typically `/home/git/gitlab/config/feature_flags/`) recursively and use the file list as a source of active feature flags.
 
 Here is a part of example `docker-compose.yml`:
@@ -825,7 +825,7 @@ services:
     - GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=git_push_create_all_pipelines,build_service_proxy
 ````
 
-Once the container up, you can see following messages in container log like below.  
+Once the container up, you can see following messages in container log like below.
 
 ````sh
 ...
@@ -1674,9 +1674,9 @@ The value of the `report-uri` directive in the `Content-Security-Policy` header
 
 ##### `GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`
 
-Comma separated list of feature flag names to be disabled. No whitespace is allowed.  
-You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>  
-Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log.  
+Comma separated list of feature flag names to be disabled. No whitespace is allowed.
+You can see all feature flags in GitLab at corresponding version of documentation: <https://docs.gitlab.com/ee/user/feature_flags.html>
+Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log.
 No defaults.
 
 ##### `GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`
@@ -2457,8 +2457,8 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul
 
 ##### `RACK_ATTACK_WHITELIST`
 
-Always allow requests from whitelisted host.   
-This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail.  
+Always allow requests from whitelisted host.
+This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail.
 If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below:
 
 ````yaml
@@ -2536,7 +2536,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2571,14 +2571,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake db:setup
+    sameersbn/gitlab:17.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2636,7 +2636,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.0
+docker pull sameersbn/gitlab:17.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.1
 ```
 
 ### Shell Access
@@ -2773,7 +2773,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d9e58927a..6f9c209b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.1.0
+17.1.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5337b9fd7..0a867c4df 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6384484fc..245cc23f7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c0e526765..85f1dc82c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8e0f232eb..74d881c92 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.0
+docker pull sameersbn/gitlab:17.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.1.0
+sameersbn/gitlab:17.1.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3e36dd0c6..50982b02d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2a2640ea5..cc28f4974 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.0
+    image: sameersbn/gitlab:17.1.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f550ddfaf..05e54ddfe 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.1.0
+        image: sameersbn/gitlab:17.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 882ab1eac23fac10e1890fb68aa7ed13b82d439a Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 29 Jun 2024 00:31:48 +0900
Subject: [PATCH 0959/1124] CI: bump jobs.release.executor to go/default:1.22

sameersbn/docker-gitlab#2962
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a048814b7..b72efbdaf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -269,12 +269,12 @@ jobs:
   release:
     executor:
       name: go/default
-      tag: '1.14'
+      tag: '1.22'
     steps:
       - checkout
       - run:
           name: Installing github-release tool
-          command: go get github.com/meterup/github-release
+          command: go install github.com/meterup/github-release@latest
       - run:
           name: Creating github release
           command: |

From 0431ba5ace26d336b1c4617520e0a4fc3f7ef51d Mon Sep 17 00:00:00 2001
From: Sebastian Toll <sebastiantoll@googlemail.com>
Date: Wed, 10 Jul 2024 21:35:43 +0200
Subject: [PATCH 0960/1124] Create external-diffs directory if missing, closes
 #2965

---
 assets/runtime/functions | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 5a24e9bc1..c603adb09 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1665,6 +1665,11 @@ initialize_datadir() {
   chmod u+rwX ${GITLAB_SHARED_DIR}/ci_secure_files
   chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/ci_secure_files
 
+  # create external-diffs dir
+  mkdir -p ${GITLAB_SHARED_DIR}/external-diffs
+  chmod u+rwX ${GITLAB_SHARED_DIR}/external-diffs
+  chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/external-diffs
+
   # create artifacts dir
   mkdir -p ${GITLAB_ARTIFACTS_DIR}
   chmod u+rwX ${GITLAB_ARTIFACTS_DIR}

From d8ff73a52a2fc1533b0f69d9c2859e17e698099e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 11 Jul 2024 21:50:24 +0200
Subject: [PATCH 0961/1124] Upgrade GitLab CE to 17.1.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 24409abc3..a0420eadd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.1.2**
+
+- gitlab: upgrade CE to v17.1.2
+- gitaly: upgrade to v17.1.2
+- gitlab-pages: upgrade to v17.1.2
+- golang: upgrade to v1.22.5
+
 **17.1.1**
 
 - gitlab: upgrade CE to v17.1.1
diff --git a/Dockerfile b/Dockerfile
index 41a7e0e71..13dafbc3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.1.1
+ARG VERSION=17.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.22.4 \
+    GOLANG_VERSION=1.22.5 \
     GITLAB_SHELL_VERSION=14.36.0 \
-    GITLAB_PAGES_VERSION=17.1.1 \
-    GITALY_SERVER_VERSION=17.1.1 \
+    GITLAB_PAGES_VERSION=17.1.2 \
+    GITALY_SERVER_VERSION=17.1.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2a3d4febe..faf00be78 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.1.1
+# sameersbn/gitlab:17.1.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.1
+docker pull sameersbn/gitlab:17.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -232,7 +232,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 ### Database
@@ -290,7 +290,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -334,7 +334,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -373,7 +373,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 #### Linking to Redis Container
@@ -400,7 +400,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 #### Mail
@@ -413,7 +413,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -433,7 +433,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -517,7 +517,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -533,7 +533,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.1.1
+ sameersbn/gitlab:17.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -556,7 +556,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -604,7 +604,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -786,14 +786,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.1.1
+    sameersbn/gitlab:17.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:sanitize
+    sameersbn/gitlab:17.1.2 app:sanitize
 ```
 
 #### Piwik
@@ -2536,7 +2536,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2571,14 +2571,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake db:setup
+    sameersbn/gitlab:17.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2636,7 +2636,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.1
+docker pull sameersbn/gitlab:17.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.2
 ```
 
 ### Shell Access
@@ -2773,7 +2773,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6f9c209b3..59a75133a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.1.1
+17.1.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0a867c4df..3ae7c2425 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 245cc23f7..d419abeed 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 85f1dc82c..d4a284740 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 74d881c92..133440671 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.1
+docker pull sameersbn/gitlab:17.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.1.1
+sameersbn/gitlab:17.1.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 50982b02d..76b59a5a7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cc28f4974..21f8fc987 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.1
+    image: sameersbn/gitlab:17.1.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 05e54ddfe..0b9192931 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.1.1
+        image: sameersbn/gitlab:17.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 6c2b6631fc44fc11b3c44e0509b01982fe11be0b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 21 Jul 2024 14:31:54 +0200
Subject: [PATCH 0962/1124] Upgrade GitLab CE to 17.2.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a0420eadd..353aea8b2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.2.0**
+
+- gitlab: upgrade CE to v17.2.0
+- gitaly: upgrade to v17.2.0
+- gitlab-pages: upgrade to v17.2.0
+- gitlab-shell: upgrade to v14.37.0
+
 **17.1.2**
 
 - gitlab: upgrade CE to v17.1.2
diff --git a/Dockerfile b/Dockerfile
index 13dafbc3b..35536a7a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.1.2
+ARG VERSION=17.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.4 \
     RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.22.5 \
-    GITLAB_SHELL_VERSION=14.36.0 \
-    GITLAB_PAGES_VERSION=17.1.2 \
-    GITALY_SERVER_VERSION=17.1.2 \
+    GITLAB_SHELL_VERSION=14.37.0 \
+    GITLAB_PAGES_VERSION=17.2.0 \
+    GITALY_SERVER_VERSION=17.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e95ad7a1a..87e59ccff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.1.2
+# sameersbn/gitlab:17.2.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.2
+docker pull sameersbn/gitlab:17.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.1.2
+ sameersbn/gitlab:17.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.1.2
+    sameersbn/gitlab:17.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:sanitize
+    sameersbn/gitlab:17.2.0 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake db:setup
+    sameersbn/gitlab:17.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.2
+docker pull sameersbn/gitlab:17.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.0
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 59a75133a..290a3f36d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.1.2
+17.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 3ae7c2425..4ef52f7f9 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d419abeed..b4fb75277 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d4a284740..8367f63fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 133440671..7633ed22a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.1.2
+docker pull sameersbn/gitlab:17.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.1.2
+sameersbn/gitlab:17.2.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 76b59a5a7..a85aaaa2a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 21f8fc987..b9df439a8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.1.2
+    image: sameersbn/gitlab:17.2.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0b9192931..aede83741 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.1.2
+        image: sameersbn/gitlab:17.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 7fa534a1c1a0adbf8e5c476f620c1aab7e00eeec Mon Sep 17 00:00:00 2001
From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:09:36 +0200
Subject: [PATCH 0963/1124] Fix typos

---
 CONTRIBUTING.md               |  4 +-
 Changelog.md                  | 10 ++---
 README.md                     | 70 +++++++++++++++++------------------
 docs/container_registry.md    |  6 +--
 docs/keycloak-idp.md          |  4 +-
 docs/s3_compatible_storage.md |  4 +-
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dbb5cdb4d..1ec790677 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # GitLab-CI Configuration
 
-When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the GitLab Instance. If needed several options can be overriden.
+When using your own GitLab instance, the provided .gitlab-ci.yml will automatically be using the settings provided by the GitLab instance. If needed, several options can be overriden.
 
 Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
 
@@ -9,4 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C
 | `CI_REGISTRY`          | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
 | `CI_REGISTRY_USER`     | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
 | `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
-| `DOCKER_IMAGE`         | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |
+| `DOCKER_IMAGE`         | `sameersbn/gitlab` | Docker image name, will automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will cause the image to be uploaded to the local registry of the project within GitLab. |
diff --git a/Changelog.md b/Changelog.md
index 353aea8b2..943922b96 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1754,7 +1754,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v10.4.3
 
 **10.4.2-1**
-- FIXED SSH Host Key generation through droping the support for rsa1
+- FIXED SSH Host Key generation through dropping the support for rsa1
 
 **10.4.2**
 - gitlab: upgrade CE to v10.4.2
@@ -1888,7 +1888,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **9.4.0**
 - gitlab: upgrade to CE v9.4.0
 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137))
-- Added more security for regenarting certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
+- Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
 
 **9.3.9**
 - gitlab: upgrade to CE v9.3.9
@@ -1946,7 +1946,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade to CE v9.2.1
 
 **9.2.0**
-- gilab: upgrade to CE v9.2.0
+- gitlab: upgrade to CE v9.2.0
 - Add flexibility to use versions committed into gitlab-ce
 
 **9.1.4**
@@ -2019,7 +2019,7 @@ This file only reflects the changes that are made in this image. Please refer to
 - added `GITLAB_PAGES_EXTERNAL_HTTPS`
 - added `SSL_PAGES_KEY_PATH`
 - added `SSL_PAGES_CERT_PATH`
-- added nodejs 7.x as core dependencie
+- added nodejs 7.x as core dependencies
 - added gitlab-pages daemon
 
 **8.16.6**
@@ -2706,7 +2706,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 **7.2.0-1**
 - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used.
 - fix relative root access without the trailing '/' character
-- added seperate server block for http config in gitlab.https.permissive. Fixes #127
+- added separate server block for http config in gitlab.https.permissive. Fixes #127
 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option.
 
 **7.2.0**
diff --git a/README.md b/README.md
index 87e59ccff..690655c60 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@
 
 Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform.
 
-GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the the official GitLab documentation.
+GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the official GitLab documentation.
 
 For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/install/) which includes a [GitLab image for Docker](https://docs.gitlab.com/omnibus/docker/).
 
@@ -107,9 +107,9 @@ wget -qO- https://get.docker.com/ | sh
 
 Fedora and RHEL/CentOS users should try disabling selinux with `setenforce 0` and check if resolves the issue. If it does than there is not much that I can help you with. You can either stick with selinux disabled (not recommended by redhat) or switch to using ubuntu.
 
-You may also set `DEBUG=true` to enable debugging of the entrypoint script, which could help you pin point any configuration issues.
+You may also set `DEBUG=true` to enable debugging of the entrypoint script, which could help you pinpoint any configuration issues.
 
-If using the latest docker version and/or disabling selinux does not fix the issue then please file a issue request on the [issues](https://github.com/sameersbn/docker-gitlab/issues) page.
+If using the latest docker version and/or disabling selinux does not fix the issue then please file an issue request on the [issues](https://github.com/sameersbn/docker-gitlab/issues) page.
 
 In your issue report please make sure you provide the following information:
 
@@ -246,7 +246,7 @@ GitLab uses a database backend to store its data. You can configure this image t
 
 **Important note:** This image is shipped with different versions of the `postgresql-client`.
 
-During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime.
+During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may cause issues). All other versions of the `postgresql-client` are deleted at runtime.
 
 This behavior can be checked using the command `docker logs` and an output like the following should be available:
 
@@ -261,7 +261,7 @@ Configuring gitlab::database
 …
 ````
 
-Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belong to
+Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently, these belong to
 
 - `postgresql-client-13`,
 - `postgresql-client-14`,
@@ -279,7 +279,7 @@ CREATE DATABASE gitlabhq_production;
 GRANT ALL PRIVILEGES ON DATABASE gitlabhq_production to gitlab;
 ```
 
-Additionally since GitLab `8.6.0` the `pg_trgm` extension should also be loaded for the `gitlabhq_production` database.
+Additionally, since GitLab `8.6.0` the `pg_trgm` extension should also be loaded for the `gitlabhq_production` database.
 
 We are now ready to start the GitLab application.
 
@@ -302,7 +302,7 @@ If a postgresql container is linked, only the `DB_HOST` and `DB_PORT` settings a
 
 To illustrate linking with a postgresql container, we will use the [sameersbn/postgresql](https://github.com/sameersbn/docker-postgresql) image. When using postgresql image in production you should mount a volume for the postgresql data store. Please refer the [README](https://github.com/sameersbn/docker-postgresql/blob/master/README.md) of docker-postgresql for details.
 
-First, lets pull the postgresql image from the docker index.
+First, let's pull the postgresql image from the docker index.
 
 ```bash
 docker pull sameersbn/postgresql:14-20230628
@@ -383,7 +383,7 @@ You can link this image with a redis container to satisfy gitlab's redis require
 
 To illustrate linking with a redis container, we will use the [redis](https://github.com/docker-library/redis) image. Please refer the [README](https://github.com/docker-library/docs/blob/master/redis/README.md) for details.
 
-First, lets pull the redis image from the docker index.
+First, let's pull the redis image from the docker index.
 
 ```bash
 docker pull redis:6.2
@@ -441,7 +441,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p
 
 #### SSL
 
-Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section.
+Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self-signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section.
 
 Jump to the [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) section if you are using a load balancer such as hipache, haproxy or nginx.
 
@@ -496,7 +496,7 @@ In case use of docker-compose ...
 
 ```$>docker volume inspect```
 
-look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint"
+Look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint"
 
 ```bash
 mkdir -p /srv/docker/gitlab/gitlab/certs
@@ -506,7 +506,7 @@ cp dhparam.pem /srv/docker/gitlab/gitlab/certs/
 chmod 400 /srv/docker/gitlab/gitlab/certs/gitlab.key
 ```
 
-Great! we are now just one step away from having our application secured.
+Great! We are now just one step away from having our application secured.
 
 ##### Enabling HTTPS support
 
@@ -527,7 +527,7 @@ In this configuration, any requests made over the plain http protocol will autom
 
 HSTS if supported by the browsers makes sure that your users will only reach your sever via HTTPS. When the user comes for the first time it sees a header from the server which states for how long from now this site should only be reachable via HTTPS - that's the HSTS max-age value.
 
-With `NGINX_HSTS_MAXAGE` you can configure that value. The default value is `31536000` seconds. If you want to disable a already sent HSTS MAXAGE value, set it to `0`.
+With `NGINX_HSTS_MAXAGE` you can configure that value. The default value is `31536000` seconds. If you want to disable an already sent HSTS MAXAGE value, set it to `0`.
 
 ```bash
 docker run --name gitlab -d \
@@ -543,7 +543,7 @@ If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
 
 Load balancers like nginx/haproxy/hipache talk to backend applications over plain http and as such the installation of ssl keys and certificates are not required and should **NOT** be installed in the container. The SSL configuration has to instead be done at the load balancer.
 
-However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`. Additionally you will need to set the `SSL_SELF_SIGNED` option to `true` if self signed SSL certificates are in use.
+However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`. Additionally, you will need to set the `SSL_SELF_SIGNED` option to `true` if self-signed SSL certificates are in use.
 
 With this in place, you should configure the load balancer to support handling of https requests. But that is out of the scope of this document. Please refer to [Using SSL/HTTPS with HAProxy](http://seanmcgary.com/posts/using-sslhttps-with-haproxy) for information on the subject.
 
@@ -568,7 +568,7 @@ In case GitLab responds to any kind of POST request (login, OAUTH, changing sett
 
 ##### Establishing trust with your server
 
-This section deals will self-signed ssl certificates. If you are using CA certified certificates, your done.
+This section deals will self-signed ssl certificates. If you are using CA certified certificates, you're done.
 
 This section is more of a client side configuration so as to add a level of confidence at the client to be 100 percent sure they are communicating with whom they think they.
 
@@ -597,7 +597,7 @@ By default, our own server certificate [gitlab.crt](#generation-of-self-signed-c
 
 #### Deploy to a subdirectory (relative url root)
 
-By default GitLab expects that your application is running at the root (eg. /). This section explains how to run your application inside a directory.
+By default, GitLab expects that your application is running at the root e.g.. /). This section explains how to run your application inside a directory.
 
 Let's assume we want to deploy our application to '/git'. GitLab needs to know this directory to generate the appropriate routes. This can be specified using the `GITLAB_RELATIVE_URL_ROOT` configuration option like so:
 
@@ -646,7 +646,7 @@ You can also restrict logins to a single domain by adding `--env "OAUTH_GOOGLE_R
 
 ##### Facebook
 
-To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret.
+To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate an API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret.
 
 Once you have the API key and secret generated, configure them using the `OAUTH_FACEBOOK_API_KEY` and `OAUTH_FACEBOOK_APP_SECRET` environment variables respectively.
 
@@ -654,7 +654,7 @@ For example, if your API key is `xxx` and the API secret key is `yyy`, then addi
 
 ##### Twitter
 
-To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter.
+To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate an API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter.
 
 Once you have the API key and secret generated, configure them using the `OAUTH_TWITTER_API_KEY` and `OAUTH_TWITTER_APP_SECRET` environment variables respectively.
 
@@ -752,7 +752,7 @@ See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/o
 
 #### Gitlab Pages
 
-Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`.
+Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the environment variable `GITLAB_PAGES_ENABLED` to `true`.
 
 #### Gitlab Pages Access Control
 
@@ -760,7 +760,7 @@ Since version `11.5.0` Gitlab pages supports access control. This allows only ac
 
 Gitlab pages access control requires additional configuration before activating it through the variable `GITLAB_PAGES_ACCESS_CONTROL`.
 
-Gitab pages access control makes use of the Gitlab OAuth Module.
+GitLab pages access control makes use of the Gitlab OAuth Module.
 
 - Goto the Gitlab Admin area
 - Select `Applications` in the menu
@@ -771,11 +771,11 @@ Gitab pages access control makes use of the Gitlab OAuth Module.
     - Trusted: NO (Do not select)
     - Redirect URI: `https://projects.<GITLAB_PAGES_DOMAIN>/auth`
 
-Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is to following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint.
+Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is the following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint.
 
-This means that if you run your gitlab pages at domain `pages.example.io` this will be a wilcard domain where your projects are created based on their namespace. The best trick is to enter a NON-Existing gitlab project pages URI as the redirect URI.
+This means that if you run your gitlab pages at domain `pages.example.io` this will be a wildcard domain where your projects are created based on their namespace. The best trick is to enter a NON-Existing gitlab project pages URI as the redirect URI.
 
-In the example above; the pages domain `projects` has been chosen. This will cause the nginx, either the built in or your own loadbalancer to redirect `*.<GITLAB_PAGES_DOMAIN>` to the `gitlab-pages` daemon. Which will trigger the pages endpoint.
+In the example above; the pages domain `projects` has been chosen. This will cause the nginx, either the built in or your own load balancer to redirect `*.<GITLAB_PAGES_DOMAIN>` to the `gitlab-pages` daemon. Which will trigger the pages endpoint.
 
 Make sure to choose own which does not exist and make sure that the request is routed to the `gitlab-pages` daemon if you are using your own HTTP load balancer in front of Gitlab.
 
@@ -789,10 +789,10 @@ Add to following environment variables to your Gitlab Container.
 | GITLAB_PAGES_ACCESS_SECRET | Optional | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. |
 | GITLAB_PAGES_ACCESS_CONTROL_SERVER | Required | Gitlab instance URI, example: `https://gitlab.example.io` |
 | GITLAB_PAGES_ACCESS_CLIENT_ID | Required | Client ID from earlier generated OAuth application |
-| GITLAB_PAGES_ACCESS_CLIENT_SECRET | Required | Client Secret from earlier genereated OAuth application |
+| GITLAB_PAGES_ACCESS_CLIENT_SECRET | Required | Client Secret from earlier generated OAuth application |
 | GITLAB_PAGES_ACCESS_REDIRECT_URI | Required | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` |
 
-After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project.
+After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages permission level for the project.
 
 #### External Issue Trackers
 
@@ -919,7 +919,7 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte
 
 ##### `GITLAB_TIMEZONE`
 
-Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ`
+Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will affect cron, see variable `TZ`
 
 ##### `GITLAB_ROOT_PASSWORD`
 
@@ -1255,7 +1255,7 @@ Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSO
 
 ##### `GITLAB_PACKAGES_ENABLED`
 
-Enable/Disable Pakages support. Defaults to `true`.
+Enable/Disable Packages support. Defaults to `true`.
 
 ##### `GITLAB_PACKAGES_DIR`
 
@@ -1551,7 +1551,7 @@ Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Default
 
 ##### `GITLAB_PAGES_ARTIFACTS_SERVER`
 
-Set to `true` to enable pages artifactsserver, enabled by default.
+Set to `true` to enable pages artifacts server, enabled by default.
 
 ##### `GITLAB_PAGES_ARTIFACTS_SERVER_URL`
 
@@ -1559,11 +1559,11 @@ If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pa
 
 ##### `GITLAB_PAGES_EXTERNAL_HTTP`
 
-Sets GitLab Pages external http to receive request on an independen port. Disabled by default
+Sets GitLab Pages external http to receive request on an independent port. Disabled by default
 
 ##### `GITLAB_PAGES_EXTERNAL_HTTPS`
 
-Sets GitLab Pages external https to receive request on an independen port. Disabled by default
+Sets GitLab Pages external https to receive request on an independent port. Disabled by default
 
 ##### `GITLAB_PAGES_ACCESS_CONTROL`
 
@@ -1587,7 +1587,7 @@ Client ID from earlier generated OAuth application
 
 ##### `GITLAB_PAGES_ACCESS_CLIENT_SECRET`
 
-Client Secret from earlier genereated OAuth application
+Client Secret from earlier generated OAuth application
 
 ##### `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
@@ -1710,7 +1710,7 @@ This parameter is the same as [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_f
 
 ##### `SSL_SELF_SIGNED`
 
-Set to `true` when using self signed ssl certificates. `false` by default.
+Set to `true` when using self-signed ssl certificates. `false` by default.
 
 ##### `SSL_CERTIFICATE_PATH`
 
@@ -1898,7 +1898,7 @@ The database database connection pool count. Defaults to `10`.
 
 ##### `DB_PREPARED_STATEMENTS`
 
-Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/)
+Whether to use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/)
 
 ##### `SMTP_ENABLED`
 
@@ -2062,7 +2062,7 @@ Attribute fields for the shown mail address. Default to `['mail', 'email', 'user
 
 ##### `LDAP_USER_ATTRIBUTE_NAME`
 
-Attribute field for the used username of a user. Default to `cn`.
+Attribute field for the used username of a user. Defaults to `cn`.
 
 ##### `LDAP_USER_ATTRIBUTE_FIRSTNAME`
 
@@ -2442,7 +2442,7 @@ AWS bucket for backup uploads. No defaults.
 
 ##### `AWS_BACKUP_MULTIPART_CHUNK_SIZE`
 
-Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html)
+Enables multipart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html)
 
 ##### `AWS_BACKUP_ENCRYPTION`
 
@@ -2642,7 +2642,7 @@ The image can be configured to automatically upload the backups to an AWS S3 buc
 
 More details about the appropriate IAM user properties can found on [doc.gitlab.com](http://doc.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage)
 
-For remote backup to selfhosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT`.
+For remote backup to self-hosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT`.
 
 AWS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed.
 
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7633ed22a..e2a4b68de 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -36,7 +36,7 @@ the GitLab installation and the registry are:
 
 GitLab needs a certificate ("auth token") to talk to the registry API. The
 tokens must be provided in the `/certs` directory of your container. You could
-use an existing domain ceritificate or create your own with a very long
+use an existing domain certificate or create your own with a very long
 lifetime like this:
 
 ```bash
@@ -224,7 +224,7 @@ Read more about the individual driver's config options in the
 > **Warning** GitLab will not backup Docker images that are not stored on the filesystem. Remember to enable backups with your object storage provider if desired.
 >
 > If you use **filesystem** as storage driver you need to mount the path from `GITLAB_REGISTRY_DIR` of the GitLab container in the registry container. So both container can access the registry data.
-> If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be seprated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted seperated the whole restoring proccess of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail.
+> If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be separated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted separated the whole restoring process of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail.
 > An example how it works is in the `docker-compose`.
 
 ### Example for Amazon Simple Storage Service (s3)
@@ -265,7 +265,7 @@ storage:
     - REGISTRY_STORAGE_DELETE_ENABLED=true
 ```
 
-Generaly for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration).
+Generally for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration).
 
 
 ## Storage limitations
diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index b3aff53c3..61f76ce65 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -1,4 +1,4 @@
-# Integrate Keycloak as a IDP with GitLab
+# Integrate Keycloak as an IDP with GitLab
 
 In this document, we will explain how to set up Keycloak and integrate it into GitLab.
 
@@ -73,7 +73,7 @@ Visit the `Users` tab and click on `View all users` to modify the Admin user.
 Modify the `Email`, `First name` and `Last Name` fields.
 ![admin-account](images/keycloak-admin-acc.png)
 
-Deploy GitLab, Reddis and PostgreSQL by running the following command: `docker-compose up -d gitlab redis postgresql`.
+Deploy GitLab, Redis and PostgreSQL by running the following command: `docker-compose up -d gitlab redis postgresql`.
 
 You can now login on the local GitLab instance with with Keycloak on your [local IP](http://localhost:10080).
 
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index ca281b709..ed815750e 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -1,7 +1,7 @@
 GitLab Backup to s3 compatible storage
 =================================================
 
-Enables automatic backups to selfhosted s3 compatible storage like minio (https://minio.io/) and others.
+Enables automatic backups to self-hosted s3 compatible storage like minio (https://minio.io/) and others.
 This is an extend of AWS Remote Backups.
 
 As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
@@ -41,7 +41,7 @@ where:
 | `AWS_BACKUP_ACCESS_KEY_ID` | AWS access key id. No defaults. |
 | `AWS_BACKUP_SECRET_ACCESS_KEY` | AWS secret access key. No defaults. |
 | `AWS_BACKUP_BUCKET` | AWS bucket for backup uploads. No defaults. |
-| `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) |
+| `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables multipart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) |
 
 For more info look at [Available Configuration Parameters](https://github.com/sameersbn/docker-gitlab#available-configuration-parameters).
 

From 46fcdf14299ef36000a715334564c18ae829e8e1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 28 Jul 2024 21:26:48 +0200
Subject: [PATCH 0964/1124] Upgrade GitLab CE to 17.2.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 943922b96..c0cac4678 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.2.1**
+
+- gitlab: upgrade CE to v17.2.1
+- gitaly: upgrade to v17.2.1
+- gitlab-pages: upgrade to v17.2.1
+- ruby: upgrade to v3.2.5
+
 **17.2.0**
 
 - gitlab: upgrade CE to v17.2.0
diff --git a/Dockerfile b/Dockerfile
index 35536a7a6..53a41ccd2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.2.0
+ARG VERSION=17.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.4 \
-    RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
+    RUBY_VERSION=3.2.5 \
+    RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.22.5 \
     GITLAB_SHELL_VERSION=14.37.0 \
-    GITLAB_PAGES_VERSION=17.2.0 \
-    GITALY_SERVER_VERSION=17.2.0 \
+    GITLAB_PAGES_VERSION=17.2.1 \
+    GITALY_SERVER_VERSION=17.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 690655c60..40b56e457 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.2.0
+# sameersbn/gitlab:17.2.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.0
+docker pull sameersbn/gitlab:17.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.2.0
+ sameersbn/gitlab:17.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.2.0
+    sameersbn/gitlab:17.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:sanitize
+    sameersbn/gitlab:17.2.1 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake db:setup
+    sameersbn/gitlab:17.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.0
+docker pull sameersbn/gitlab:17.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.1
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 290a3f36d..7c95a0759 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.0
+17.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4ef52f7f9..e5abf0b92 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b4fb75277..929c1ce47 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 8367f63fc..73abfd9a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e2a4b68de..caa28f029 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.0
+docker pull sameersbn/gitlab:17.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.2.0
+sameersbn/gitlab:17.2.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a85aaaa2a..7e54e43f8 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b9df439a8..47dbb2e03 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.0
+    image: sameersbn/gitlab:17.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index aede83741..3696a9e50 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.2.0
+        image: sameersbn/gitlab:17.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 1a3722c6c0b9bd76cedee65708d7b092d70b6c37 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 8 Aug 2024 19:35:29 +0200
Subject: [PATCH 0965/1124] Upgrade GitLab CE to 17.2.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c0cac4678..404cb83f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.2.2**
+
+- gitlab: upgrade CE to v17.2.2
+- gitaly: upgrade to v17.2.2
+- gitlab-pages: upgrade to v17.2.2
+- golang: upgrade to v1.22.6
+
 **17.2.1**
 
 - gitlab: upgrade CE to v17.2.1
diff --git a/Dockerfile b/Dockerfile
index 53a41ccd2..5959c105a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.2.1
+ARG VERSION=17.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.22.5 \
+    GOLANG_VERSION=1.22.6 \
     GITLAB_SHELL_VERSION=14.37.0 \
-    GITLAB_PAGES_VERSION=17.2.1 \
-    GITALY_SERVER_VERSION=17.2.1 \
+    GITLAB_PAGES_VERSION=17.2.2 \
+    GITALY_SERVER_VERSION=17.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 40b56e457..92719bd5d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.2.1
+# sameersbn/gitlab:17.2.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.1
+docker pull sameersbn/gitlab:17.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.2.1
+ sameersbn/gitlab:17.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.2.1
+    sameersbn/gitlab:17.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:sanitize
+    sameersbn/gitlab:17.2.2 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake db:setup
+    sameersbn/gitlab:17.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.1
+docker pull sameersbn/gitlab:17.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.2
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7c95a0759..d3b2c4f0d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.1
+17.2.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e5abf0b92..e69db32b8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 929c1ce47..1fdc00f5d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 73abfd9a3..52b04d433 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index caa28f029..1bf54801e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.1
+docker pull sameersbn/gitlab:17.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.2.1
+sameersbn/gitlab:17.2.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7e54e43f8..612a48423 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 47dbb2e03..380d7064d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.1
+    image: sameersbn/gitlab:17.2.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3696a9e50..2258ef63f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.2.1
+        image: sameersbn/gitlab:17.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From dabfd42eaccd7307e45590bcf634ae665110995c Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 14 Aug 2024 00:50:24 +0900
Subject: [PATCH 0966/1124] fix script to configure feature flags that cannot
 enable flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When generating the list of flags that would actually be enabled,
the value specified in the option was ANDed with the list of flags that actually existed.
At this time, I mistakenly performed a logical AND with the list
of "values ​​to invalidate" specified in the option.
This mistake caused a problem in which some flags could not be enabled.
This commit fixes this to AND with the list of values ​​you want to enable.
---
 assets/runtime/scripts/configure_feature_flags.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb
index 90ccd2dce..efe1368a5 100644
--- a/assets/runtime/scripts/configure_feature_flags.rb
+++ b/assets/runtime/scripts/configure_feature_flags.rb
@@ -64,7 +64,7 @@ def run
     if succeed
       available_flags = self.available_feature_flags
       disable_targets = available_flags & opts[:to_be_disabled]
-      enable_targets = available_flags & opts[:to_be_disabled]
+      enable_targets = available_flags & opts[:to_be_enabled]
 
       disable_targets.each do |feature|
         Feature.disable(feature)

From b3b09c619c316ba34b0668457f6b74c91b3ac43e Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 14 Aug 2024 00:51:49 +0900
Subject: [PATCH 0967/1124] fix indent in script configure_feature_flags.rb

---
 assets/runtime/scripts/configure_feature_flags.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb
index efe1368a5..72197a99d 100644
--- a/assets/runtime/scripts/configure_feature_flags.rb
+++ b/assets/runtime/scripts/configure_feature_flags.rb
@@ -21,7 +21,7 @@ def available_feature_flags()
       feature_flag_yamls.concat(Dir.glob("#{Gitlab.root}/ee/config/feature_flags/**/*.yml"))
     end if
 
-      list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) }
+    list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) }
     list
   end
 

From a1753e383c634c5128ad9d44c38ed7af26c5b306 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 Aug 2024 20:08:18 +0200
Subject: [PATCH 0968/1124] Upgrade GitLab CE to 17.3.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 404cb83f9..241802f3d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.3.0**
+
+- gitlab: upgrade CE to v17.3.0
+- gitaly: upgrade to v17.3.0
+- gitlab-pages: upgrade to v17.3.0
+- gitlab-shell: upgrade to v14.38.0
+- golang: upgrade to v1.23.0
+
 **17.2.2**
 
 - gitlab: upgrade CE to v17.2.2
diff --git a/Dockerfile b/Dockerfile
index 5959c105a..06a325f8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.2.2
+ARG VERSION=17.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.22.6 \
-    GITLAB_SHELL_VERSION=14.37.0 \
-    GITLAB_PAGES_VERSION=17.2.2 \
-    GITALY_SERVER_VERSION=17.2.2 \
+    GOLANG_VERSION=1.23.0 \
+    GITLAB_SHELL_VERSION=14.38.0 \
+    GITLAB_PAGES_VERSION=17.3.0 \
+    GITALY_SERVER_VERSION=17.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 92719bd5d..e2e03cec5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.2.2
+# sameersbn/gitlab:17.3.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.2
+docker pull sameersbn/gitlab:17.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.2.2
+ sameersbn/gitlab:17.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.2.2
+    sameersbn/gitlab:17.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:sanitize
+    sameersbn/gitlab:17.3.0 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake db:setup
+    sameersbn/gitlab:17.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.2
+docker pull sameersbn/gitlab:17.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.0
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d3b2c4f0d..5aadcd3f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.2.2
+17.3.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e69db32b8..cdb261bca 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 1fdc00f5d..ba1f72588 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 52b04d433..3dd1c2828 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1bf54801e..d4465c78f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.2.2
+docker pull sameersbn/gitlab:17.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.2.2
+sameersbn/gitlab:17.3.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 612a48423..3824a232c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 380d7064d..0c75e0abb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.2.2
+    image: sameersbn/gitlab:17.3.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2258ef63f..30f6cfc11 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.2.2
+        image: sameersbn/gitlab:17.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 4b82b80d531ee6ccd818df438906e158b57e7017 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 25 Aug 2024 17:08:24 +0200
Subject: [PATCH 0969/1124] Upgrade GitLab CE to 17.3.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 241802f3d..93f00e3f2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.3.1**
+
+- gitlab: upgrade CE to v17.3.1
+- gitaly: upgrade to v17.3.1
+- gitlab-pages: upgrade to v17.3.1
+
 **17.3.0**
 
 - gitlab: upgrade CE to v17.3.0
diff --git a/Dockerfile b/Dockerfile
index 06a325f8a..b5536f032 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.3.0
+ARG VERSION=17.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.0 \
     GITLAB_SHELL_VERSION=14.38.0 \
-    GITLAB_PAGES_VERSION=17.3.0 \
-    GITALY_SERVER_VERSION=17.3.0 \
+    GITLAB_PAGES_VERSION=17.3.1 \
+    GITALY_SERVER_VERSION=17.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e2e03cec5..9b2f997a1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.3.0
+# sameersbn/gitlab:17.3.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.0
+docker pull sameersbn/gitlab:17.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.3.0
+ sameersbn/gitlab:17.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.3.0
+    sameersbn/gitlab:17.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:sanitize
+    sameersbn/gitlab:17.3.1 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake db:setup
+    sameersbn/gitlab:17.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.0
+docker pull sameersbn/gitlab:17.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.1
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5aadcd3f2..1f33a6f48 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.0
+17.3.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cdb261bca..d9a333967 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ba1f72588..8458f5ce8 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 3dd1c2828..4f0bc06ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d4465c78f..6f44f6b1a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.0
+docker pull sameersbn/gitlab:17.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.3.0
+sameersbn/gitlab:17.3.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3824a232c..cd0092d54 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0c75e0abb..d7cb255ac 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.0
+    image: sameersbn/gitlab:17.3.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 30f6cfc11..827aec021 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.3.0
+        image: sameersbn/gitlab:17.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 6f43b19d65496df823cf7fff48ab9471199fda4f Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 3 Sep 2024 17:28:31 +0900
Subject: [PATCH 0970/1124] Docs: bump minimum required PostgreSQL to 14
 (gitlab 17.x)

Also bump the requirement note in release notes
---
 README.md                | 6 +++---
 scripts/release-notes.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9b2f997a1..1bcee60b7 100644
--- a/README.md
+++ b/README.md
@@ -267,7 +267,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - `postgresql-client-14`,
 - and `postgresql-client-15`.
 
-*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x
+*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x.
 
 ##### External PostgreSQL Server
 
@@ -1866,7 +1866,7 @@ Sidekiq log format that will be used. Defaults to `json`
 
 ##### `DB_ADAPTER`
 
-The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`.
+The database type. Currently only postgresql is supported. Possible values: `postgresql`. Defaults to `postgresql`.
 
 ##### `DB_ENCODING`
 
@@ -2721,7 +2721,7 @@ Usage when using `docker-compose` can also be found there.
 >
 > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
 >
-> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
+> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 42ee9ef7f..418a6dcf4 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -41,8 +41,8 @@ Please note that this version does not yet include any rework as a consequence o
 Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance!
 
 Please note:
-- GitLab 16.6.x requires at least PostgreSQL 13.
-- As of GitLab 16.7, PostgreSQL 14 is the default version. However, PostgreSQL 14 isn't supported on Geo deployments and is planned for future releases (see <https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#1670>).
+- GitLab 17.x requires at least PostgreSQL 14.
+- See issues to be aware of when upgrading to 17.x : <https://docs.gitlab.com/ee/update/versions/gitlab_17_changes.html>
 
 ## Contributing
 

From 2232e7e3a7361b975c9a301d3dfd69e05cb562e6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 13 Sep 2024 06:55:53 +0200
Subject: [PATCH 0971/1124] Upgrade GitLab CE to 17.3.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 93f00e3f2..97db985a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.3.2**
+
+- gitlab: upgrade CE to v17.3.2
+- gitaly: upgrade to v17.3.2
+- gitlab-pages: upgrade to v17.3.2
+- golang: upgrade to v1.23.1
+
 **17.3.1**
 
 - gitlab: upgrade CE to v17.3.1
diff --git a/Dockerfile b/Dockerfile
index b5536f032..09c706692 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.3.1
+ARG VERSION=17.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.0 \
+    GOLANG_VERSION=1.23.1 \
     GITLAB_SHELL_VERSION=14.38.0 \
-    GITLAB_PAGES_VERSION=17.3.1 \
-    GITALY_SERVER_VERSION=17.3.1 \
+    GITLAB_PAGES_VERSION=17.3.2 \
+    GITALY_SERVER_VERSION=17.3.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9b2f997a1..1580c3faa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.3.1
+# sameersbn/gitlab:17.3.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.1
+docker pull sameersbn/gitlab:17.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.3.1
+ sameersbn/gitlab:17.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.3.1
+    sameersbn/gitlab:17.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:sanitize
+    sameersbn/gitlab:17.3.2 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake db:setup
+    sameersbn/gitlab:17.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.1
+docker pull sameersbn/gitlab:17.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.2
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 1f33a6f48..fd9b308ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.1
+17.3.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index d9a333967..43e801847 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8458f5ce8..6c525fe00 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4f0bc06ee..1e7b4615e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6f44f6b1a..0adc7a72f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.1
+docker pull sameersbn/gitlab:17.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.3.1
+sameersbn/gitlab:17.3.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cd0092d54..bed699c51 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d7cb255ac..74709a267 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.1
+    image: sameersbn/gitlab:17.3.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 827aec021..268b08ff6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.3.1
+        image: sameersbn/gitlab:17.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From e7f4f4678332374cbce82b2ef1fa26d77067248b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 18 Sep 2024 22:42:00 +0200
Subject: [PATCH 0972/1124] Upgrade GitLab CE to 17.3.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 97db985a5..91146254f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.3.3**
+
+- gitlab: upgrade CE to v17.3.3
+- gitaly: upgrade to v17.3.3
+- gitlab-pages: upgrade to v17.3.3
+
 **17.3.2**
 
 - gitlab: upgrade CE to v17.3.2
diff --git a/Dockerfile b/Dockerfile
index 09c706692..82bc05091 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.3.2
+ARG VERSION=17.3.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.1 \
     GITLAB_SHELL_VERSION=14.38.0 \
-    GITLAB_PAGES_VERSION=17.3.2 \
-    GITALY_SERVER_VERSION=17.3.2 \
+    GITLAB_PAGES_VERSION=17.3.3 \
+    GITALY_SERVER_VERSION=17.3.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ec4c2d9fd..6a6e243a8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.3.2
+# sameersbn/gitlab:17.3.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.2
+docker pull sameersbn/gitlab:17.3.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.3.2
+ sameersbn/gitlab:17.3.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.3.2
+    sameersbn/gitlab:17.3.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:sanitize
+    sameersbn/gitlab:17.3.3 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake db:setup
+    sameersbn/gitlab:17.3.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.3.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.2
+docker pull sameersbn/gitlab:17.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.3
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fd9b308ed..d1c738c5f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.2
+17.3.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 43e801847..315d6cf5e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6c525fe00..236137000 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e7b4615e..302801a36 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0adc7a72f..0d1a54c43 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.2
+docker pull sameersbn/gitlab:17.3.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.3.2
+sameersbn/gitlab:17.3.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index bed699c51..07eebde50 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 74709a267..190dafbc2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.2
+    image: sameersbn/gitlab:17.3.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 268b08ff6..ab1ea55f2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.3.2
+        image: sameersbn/gitlab:17.3.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 38be108bc083cee041e616d49fc4f6c4108e1ff0 Mon Sep 17 00:00:00 2001
From: Joerg Stoever <joerg.stoever@gmail.com>
Date: Fri, 20 Sep 2024 12:03:31 +0900
Subject: [PATCH 0973/1124] health check: use https only when https enabled
 with non-self signed cert

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index a9a778c53..2a9cfe0b3 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1855,7 +1855,7 @@ generate_healthcheck_script() {
   # configure healthcheck script
   ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html
   local HEALTHCHECK_PROTOCOL="http"
-  if [[ "${GITLAB_HTTPS}" == true ]]; then
+  if [[ "${GITLAB_HTTPS}" == true && "${SSL_SELF_SIGNED}" == false ]]; then
     HEALTHCHECK_PROTOCOL="${HEALTHCHECK_PROTOCOL}s"
   fi
 cat > /usr/local/sbin/healthcheck <<EOF

From f9d2c98995bb786ca12dd768e552d795ce7be0db Mon Sep 17 00:00:00 2001
From: Joerg Stoever <joerg.stoever@gmail.com>
Date: Fri, 20 Sep 2024 12:03:42 +0900
Subject: [PATCH 0974/1124] health check: remove curl's --location option

When the healthcheck feature introduced, the script were generated on build time
and url was fixed to "http://localhost/-/liveness".
See pull request #2102

nginx is configured to redirect all http traffic to https when `GITLAB_HTTPS` is enabled.
(see https://github.com/sameersbn/docker-gitlab/blob/ac9e1fe/assets/runtime/config/nginx/gitlab-ssl#L41-L54),
`--location` option is set to follow the redirection.
See pull request #2165

Health check script generation has been ported to the runtime,
allowing us to dynamically generate health check URLs
while referencing configuration parameters.
See #2338

If configured correctly, the redirect will not occur and the option can be removed.

Original removal suggestion by @Gaibhne , additional (historical) research by @kkimurak.
Co-authored-by: Kazunori Kimura <kkimura@ims.ac.jp>
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 2a9cfe0b3..4f7908bb2 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1861,7 +1861,7 @@ generate_healthcheck_script() {
 cat > /usr/local/sbin/healthcheck <<EOF
 #!/bin/bash
 url=${HEALTHCHECK_PROTOCOL}://localhost${GITLAB_RELATIVE_URL_ROOT}/-/liveness
-options=( '--insecure' '--location' '--silent' )
+options=( '--insecure' '--silent' )
 curl "\${options[@]}" \$url
 [[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]
 EOF

From ba429ab996c21ae5c7ab502f20b71b3390155fec Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 20 Sep 2024 12:03:56 +0900
Subject: [PATCH 0975/1124] Unset default value for
 GITLAB_MONITORING_IP_WHITELIST

On upstream, expected default value is `127.0.0.1/8`
and it is already listed in corresponding configuration.
`GITLAB_MONITORING_IP_WHITELIST` is used to allow monitoring from hosts other than loopback (localhost).

So just unset default value for it.
If the value is not set, the line specifying this "additional" IP range will be removed.
---
 README.md                   | 2 +-
 assets/runtime/env-defaults | 2 +-
 assets/runtime/functions    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6a6e243a8..43ed70669 100644
--- a/README.md
+++ b/README.md
@@ -1611,7 +1611,7 @@ Time between sampling of unicorn socket metrics, in seconds, defaults to `10`
 
 ##### `GITLAB_MONITORING_IP_WHITELIST`
 
-IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8`
+IP whitelist to access monitoring endpoints. No defaults.
 
 ##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED`
 
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 7c6de6d97..14e0ccc16 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -629,7 +629,7 @@ GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_IN
 
 ## MONITORING
 GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10}
-GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"}
+GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"}
 GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 4f7908bb2..be6a0133c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -351,6 +351,10 @@ gitlab_configure_gitaly() {
 gitlab_configure_monitoring() {
   echo "Configuring gitlab::monitoring..."
 
+  if [ "${GITLAB_MONITORING_IP_WHITELIST}" == "" ]; then
+    exec_as_git sed -i "/{{GITLAB_MONITORING_IP_WHITELIST}}/d" ${GITLAB_CONFIG}
+  fi
+
   update_template ${GITLAB_CONFIG} \
     GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL \
     GITLAB_MONITORING_IP_WHITELIST \

From e5dc2dd5b675f686db85905ce8ab0b478fec7e3d Mon Sep 17 00:00:00 2001
From: Joerg Stoever <joerg.stoever@gmail.com>
Date: Fri, 30 Aug 2024 18:52:12 +0900
Subject: [PATCH 0976/1124] healthcheck: Use IPv4 loopback address instead of
 localhost

Access to health check resources such as /-/liveness
is restricted to IPs specified in gitlab.monitoring.ip_whitelist
(`GITLAB_MONITORING_IP_WHITELIST`).
The name `localhost` is solved to IPv6 loopback address (::1)
that is not listed in the whitelist by default.

Possible alternate designs:
- Add IPv6 loopback to whitelist
- Disable IPv6 for gitlab container by specifying `net.ipv6.conf.all.disable_ipv6=1`
  in docker-compose.yml for example
  See https://github.com/sameersbn/docker-gitlab/issues/2766#issuecomment-2098030791
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index be6a0133c..67750f2f7 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1864,7 +1864,7 @@ generate_healthcheck_script() {
   fi
 cat > /usr/local/sbin/healthcheck <<EOF
 #!/bin/bash
-url=${HEALTHCHECK_PROTOCOL}://localhost${GITLAB_RELATIVE_URL_ROOT}/-/liveness
+url=${HEALTHCHECK_PROTOCOL}://127.0.0.1${GITLAB_RELATIVE_URL_ROOT}/-/liveness
 options=( '--insecure' '--silent' )
 curl "\${options[@]}" \$url
 [[ "\$(curl \${options[@]} -o /dev/null -I -w '%{http_code}' \$url)" == "200" ]]

From 5d51b74974bedf0020cde6fe2020cd314e252c13 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Sep 2024 21:50:48 +0200
Subject: [PATCH 0977/1124] Upgrade GitLab CE to 17.4.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 91146254f..45cc52b77 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.4.0**
+
+- gitlab: upgrade CE to v17.4.0
+- gitaly: upgrade to v17.4.0
+- gitlab-pages: upgrade to v17.4.0
+- gitlab-shell: upgrade to v14.39.0
+
 **17.3.3**
 
 - gitlab: upgrade CE to v17.3.3
diff --git a/Dockerfile b/Dockerfile
index 82bc05091..f84f95c9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.3.3
+ARG VERSION=17.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.1 \
-    GITLAB_SHELL_VERSION=14.38.0 \
-    GITLAB_PAGES_VERSION=17.3.3 \
-    GITALY_SERVER_VERSION=17.3.3 \
+    GITLAB_SHELL_VERSION=14.39.0 \
+    GITLAB_PAGES_VERSION=17.4.0 \
+    GITALY_SERVER_VERSION=17.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 43ed70669..e876f2bf5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.3.3
+# sameersbn/gitlab:17.4.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.3
+docker pull sameersbn/gitlab:17.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.3.3
+ sameersbn/gitlab:17.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.3.3
+    sameersbn/gitlab:17.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:sanitize
+    sameersbn/gitlab:17.4.0 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake db:setup
+    sameersbn/gitlab:17.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:env:info
+    sameersbn/gitlab:17.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.3.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.3
+docker pull sameersbn/gitlab:17.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.0
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d1c738c5f..e64ad13cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.3
+17.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 315d6cf5e..5185c13a4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 236137000..4f23018ef 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 302801a36..dd044f216 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0d1a54c43..74d50442d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.3.3
+docker pull sameersbn/gitlab:17.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.3.3
+sameersbn/gitlab:17.4.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 07eebde50..c1c67b68e 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 190dafbc2..fd134dc99 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.3.3
+    image: sameersbn/gitlab:17.4.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ab1ea55f2..8d0c13e57 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.3.3
+        image: sameersbn/gitlab:17.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From d08a6ec2a9f2f02f309fce9efe0e880dcf53fadd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 26 Sep 2024 20:38:43 +0200
Subject: [PATCH 0978/1124] Upgrade GitLab CE to 17.4.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 45cc52b77..4096b1239 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.4.1**
+
+- gitlab: upgrade CE to v17.4.1
+- gitaly: upgrade to v17.4.1
+- gitlab-pages: upgrade to v17.4.1
+
 **17.4.0**
 
 - gitlab: upgrade CE to v17.4.0
diff --git a/Dockerfile b/Dockerfile
index f84f95c9b..89f6c729a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.4.0
+ARG VERSION=17.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.1 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.4.0 \
-    GITALY_SERVER_VERSION=17.4.0 \
+    GITLAB_PAGES_VERSION=17.4.1 \
+    GITALY_SERVER_VERSION=17.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index e876f2bf5..876092305 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.4.0
+# sameersbn/gitlab:17.4.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.0
+docker pull sameersbn/gitlab:17.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 ### Database
@@ -291,7 +291,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -335,7 +335,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -374,7 +374,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 #### Linking to Redis Container
@@ -401,7 +401,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 #### Mail
@@ -414,7 +414,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -434,7 +434,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -518,7 +518,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -534,7 +534,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.4.0
+ sameersbn/gitlab:17.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -605,7 +605,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -811,14 +811,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.4.0
+    sameersbn/gitlab:17.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:sanitize
+    sameersbn/gitlab:17.4.1 app:sanitize
 ```
 
 #### Piwik
@@ -2561,7 +2561,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2596,14 +2596,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake db:setup
+    sameersbn/gitlab:17.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2661,7 +2661,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.0
+docker pull sameersbn/gitlab:17.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.1
 ```
 
 ### Shell Access
@@ -2798,7 +2798,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e64ad13cb..ae704d6db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.4.0
+17.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5185c13a4..50364adf0 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4f23018ef..2ca8570fc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dd044f216..7ab59af08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 74d50442d..bc8152c56 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.0
+docker pull sameersbn/gitlab:17.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.4.0
+sameersbn/gitlab:17.4.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c1c67b68e..210364133 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fd134dc99..419d8df97 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.0
+    image: sameersbn/gitlab:17.4.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8d0c13e57..998c777a1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.4.0
+        image: sameersbn/gitlab:17.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 64e862524ce8816b2cac42c1f69f79792bc34df1 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 30 Sep 2024 06:59:16 +0900
Subject: [PATCH 0979/1124] Add postgresql-client-16

---
 Dockerfile | 2 +-
 README.md  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 89f6c729a..95bc361b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ RUN set -ex && \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-contrib redis-tools \
-      postgresql-client-13 postgresql-client-14 postgresql-client-15 \
+      postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-0-2 libssl1.1 \
       libgdbm6 libreadline8 libncurses5 libffi7 \
diff --git a/README.md b/README.md
index 876092305..f87c98d1b 100644
--- a/README.md
+++ b/README.md
@@ -265,7 +265,8 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 
 - `postgresql-client-13`,
 - `postgresql-client-14`,
-- and `postgresql-client-15`.
+- `postgresql-client-15`.
+- and `postgresql-client-16`.
 
 *NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x.
 

From f890d36ad112ccee95e52596d2be68d9a44c027c Mon Sep 17 00:00:00 2001
From: Thomas Hiller <thomas.hiller@gmx.de>
Date: Thu, 10 Oct 2024 10:02:10 +0200
Subject: [PATCH 0980/1124] pages namespace in path

---
 assets/runtime/config/gitlab-pages/config | 4 +++-
 assets/runtime/config/gitlabhq/gitlab.yml | 1 +
 assets/runtime/env-defaults               | 2 ++
 assets/runtime/functions                  | 5 +++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
index 409786090..c27dffb45 100644
--- a/assets/runtime/config/gitlab-pages/config
+++ b/assets/runtime/config/gitlab-pages/config
@@ -4,5 +4,7 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
 auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
 artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
-internal-gitlab-server=http://localhost:8181
+internal-gitlab-server=http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
 api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
+log-verbose={{GITLAB_PAGES_LOG_VERBOSE}}
+namespace-in-path={{GITLAB_PAGES_NAMESPACE_IN_PATH}}
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index f828dd6f5..81ea4f07d 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -410,6 +410,7 @@ production: &base
     artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} # Set to false if you want to disable online view of HTML artifacts
     external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages
     external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages
+    namespace_in_path: {{GITLAB_PAGES_NAMESPACE_IN_PATH}}
 
     # File that contains the shared secret key for verifying access for gitlab-pages.
     # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 14e0ccc16..c5c3c6879 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -617,6 +617,8 @@ GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-}
 GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-}
 GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-}
 GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true}
+GITLAB_PAGES_NAMESPACE_IN_PATH=${GITLAB_PAGES_NAMESPACE_IN_PATH:-false}
+GITLAB_PAGES_LOG_VERBOSE=${GITLAB_PAGES_LOG_VERBOSE:-false}
 
 ## Gitaly
 GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 67750f2f7..8710c54c0 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2153,6 +2153,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_REDIRECT_URI \
       GITLAB_PAGES_ACCESS_SECRET \
       GITLAB_PAGES_ACCESS_CONTROL_SERVER \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
@@ -2162,6 +2164,9 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
   fi
 else
   update_template ${GITLAB_PAGES_CONFIG} \
+      GITLAB_RELATIVE_URL_ROOT \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}

From 5152bcf6acd0633789dfc8a9c056495169c3e407 Mon Sep 17 00:00:00 2001
From: Thomas Hiller <thomas.hiller@gmx.de>
Date: Thu, 10 Oct 2024 10:08:55 +0200
Subject: [PATCH 0981/1124] add new options to README

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index f87c98d1b..db287f50a 100644
--- a/README.md
+++ b/README.md
@@ -1594,6 +1594,14 @@ Client Secret from earlier generated OAuth application
 
 Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth`
 
+##### `GITLAB_PAGES_NAMESPACE_IN_PATH`
+
+Enable namespace-in-path option for gitlab pages, defaults to `false`.
+
+##### `GITLAB_PAGES_LOG_VERBOSE`
+
+Enable verbose logging for gitlab pages, defaults to `falsee`.
+
 ##### `GITLAB_HTTPS`
 
 Set to `true` to enable https support, disabled by default.

From 5ce84968a6dd2a5bf48da330e2b15cce66cd46aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Marten=20Br=C3=BCggemann?= <fussel@fusselkater.org>
Date: Thu, 10 Oct 2024 15:28:04 +0200
Subject: [PATCH 0982/1124] Upgrade GitLab CE to 17.4.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4096b1239..1c29183a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.4.2**
+
+- gitlab: upgrade CE to v17.4.2
+- gitaly: upgrade to v17.4.2
+- gitlab-pages: upgrade to v17.4.2
+
 **17.4.1**
 
 - gitlab: upgrade CE to v17.4.1
diff --git a/Dockerfile b/Dockerfile
index 95bc361b7..95f7f1e92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20240530
 
-ARG VERSION=17.4.1
+ARG VERSION=17.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.1 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.4.1 \
-    GITALY_SERVER_VERSION=17.4.1 \
+    GITLAB_PAGES_VERSION=17.4.2 \
+    GITALY_SERVER_VERSION=17.4.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f87c98d1b..11e1406fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.4.1
+# sameersbn/gitlab:17.4.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.1
+docker pull sameersbn/gitlab:17.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.4.1
+ sameersbn/gitlab:17.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.4.1
+    sameersbn/gitlab:17.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:sanitize
+    sameersbn/gitlab:17.4.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake db:setup
+    sameersbn/gitlab:17.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.1
+docker pull sameersbn/gitlab:17.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ae704d6db..d68ad08bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.4.1
+17.4.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 50364adf0..4f7139664 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2ca8570fc..924d8e210 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ab59af08..5841f186f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bc8152c56..624ad6ca0 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.1
+docker pull sameersbn/gitlab:17.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.4.1
+sameersbn/gitlab:17.4.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 210364133..1063af3d1 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 419d8df97..a9d5fea45 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.1
+    image: sameersbn/gitlab:17.4.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 998c777a1..3f4aec22e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.4.1
+        image: sameersbn/gitlab:17.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From db212908ec25bbd21300ab3319f4ca85a2aa2eff Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 10 Oct 2024 19:57:54 +0200
Subject: [PATCH 0983/1124] Upgrade golang and baseimage

---
 Changelog.md | 2 ++
 Dockerfile   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1c29183a5..ba2808d7d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,8 @@ This file only reflects the changes that are made in this image. Please refer to
 - gitlab: upgrade CE to v17.4.2
 - gitaly: upgrade to v17.4.2
 - gitlab-pages: upgrade to v17.4.2
+- golang: upgrade to v1.23.2
+- ubuntu: upgrade to focal-20240918
 
 **17.4.1**
 
diff --git a/Dockerfile b/Dockerfile
index 95f7f1e92..1d1ed93c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20240530
+FROM ubuntu:focal-20240918
 
 ARG VERSION=17.4.2
 
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
     RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.1 \
+    GOLANG_VERSION=1.23.2 \
     GITLAB_SHELL_VERSION=14.39.0 \
     GITLAB_PAGES_VERSION=17.4.2 \
     GITALY_SERVER_VERSION=17.4.2 \

From 94a616c74135fa82cfd5d234e123b303433a62fe Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 18 Oct 2024 18:03:00 +0200
Subject: [PATCH 0984/1124] Upgrade GitLab CE to 17.5.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ba2808d7d..50697d5ce 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.5.0**
+
+- gitlab: upgrade CE to v17.5.0
+- gitaly: upgrade to v17.5.0
+- gitlab-pages: upgrade to v17.5.0
+- ubuntu: upgrade to focal-20241011
+
 **17.4.2**
 
 - gitlab: upgrade CE to v17.4.2
diff --git a/Dockerfile b/Dockerfile
index 1d1ed93c8..7c2ce43e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:focal-20240918
+FROM ubuntu:focal-20241011
 
-ARG VERSION=17.4.2
+ARG VERSION=17.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.2 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.4.2 \
-    GITALY_SERVER_VERSION=17.4.2 \
+    GITLAB_PAGES_VERSION=17.5.0 \
+    GITALY_SERVER_VERSION=17.5.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 11e1406fe..b9bdc77bd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.4.2
+# sameersbn/gitlab:17.5.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.2
+docker pull sameersbn/gitlab:17.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.4.2
+ sameersbn/gitlab:17.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.4.2
+    sameersbn/gitlab:17.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:sanitize
+    sameersbn/gitlab:17.5.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake db:setup
+    sameersbn/gitlab:17.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.2
+docker pull sameersbn/gitlab:17.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d68ad08bf..6f0844e02 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.4.2
+17.5.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 4f7139664..9e28bfe59 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 924d8e210..e5c6e10dd 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5841f186f..81f3f6602 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 624ad6ca0..7cb8db746 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.4.2
+docker pull sameersbn/gitlab:17.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.4.2
+sameersbn/gitlab:17.5.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 1063af3d1..41db7954d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a9d5fea45..fdb8376f6 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.4.2
+    image: sameersbn/gitlab:17.5.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3f4aec22e..8af6c5b2c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.4.2
+        image: sameersbn/gitlab:17.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 199070bec90104994ec5ebec45fbe00b989f7485 Mon Sep 17 00:00:00 2001
From: yam <yannis@datailor.fr>
Date: Thu, 24 Oct 2024 10:02:49 +0200
Subject: [PATCH 0985/1124] fix(#3010) Add symbolic link to the correct
 location of ca-cert file

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 7c2ce43e7..47c0071ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,6 +82,8 @@ LABEL \
 
 EXPOSE 22/tcp 80/tcp 443/tcp
 
+RUN ln -s /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem
+
 VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"]
 WORKDIR ${GITLAB_INSTALL_DIR}
 ENTRYPOINT ["/sbin/entrypoint.sh"]

From 3b310bcd41c95089e1b7149b5953cd77367a7982 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 25 Oct 2024 18:06:00 +0200
Subject: [PATCH 0986/1124] Upgrade GitLab CE to 17.5.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 50697d5ce..d5ff4cef0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.5.1**
+
+- gitlab: upgrade CE to v17.5.1
+- gitaly: upgrade to v17.5.1
+- gitlab-pages: upgrade to v17.5.1
+
 **17.5.0**
 
 - gitlab: upgrade CE to v17.5.0
diff --git a/Dockerfile b/Dockerfile
index 47c0071ef..db4178b0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.5.0
+ARG VERSION=17.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.5 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.2 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.5.0 \
-    GITALY_SERVER_VERSION=17.5.0 \
+    GITLAB_PAGES_VERSION=17.5.1 \
+    GITALY_SERVER_VERSION=17.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b9bdc77bd..c52414412 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.5.0
+# sameersbn/gitlab:17.5.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.0
+docker pull sameersbn/gitlab:17.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.5.0
+ sameersbn/gitlab:17.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.5.0
+    sameersbn/gitlab:17.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:sanitize
+    sameersbn/gitlab:17.5.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake db:setup
+    sameersbn/gitlab:17.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.0
+docker pull sameersbn/gitlab:17.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6f0844e02..9cbaf2372 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.5.0
+17.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9e28bfe59..b574fe5cd 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e5c6e10dd..e8a995bb1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 81f3f6602..65f5144c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7cb8db746..d84ab8264 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.0
+docker pull sameersbn/gitlab:17.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.5.0
+sameersbn/gitlab:17.5.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 41db7954d..d1e2b7a50 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fdb8376f6..ff31ba787 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.0
+    image: sameersbn/gitlab:17.5.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8af6c5b2c..c9e34f194 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.5.0
+        image: sameersbn/gitlab:17.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 87761d553e4e0b0f8e243b291e5cde5b346df04b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 14 Nov 2024 21:05:30 +0100
Subject: [PATCH 0987/1124] Upgrade GitLab CE to 17.5.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d5ff4cef0..9e1644972 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,14 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.5.2**
+
+- gitlab: upgrade CE to v17.5.2
+- gitaly: upgrade to v17.5.2
+- gitlab-pages: upgrade to v17.5.2
+- golang: upgrade to v1.23.2
+- ruby: upgrade to v3.2.6
+
 **17.5.1**
 
 - gitlab: upgrade CE to v17.5.1
diff --git a/Dockerfile b/Dockerfile
index db4178b0c..ef4b9d58a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.5.1
+ARG VERSION=17.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.5 \
-    RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
+    RUBY_VERSION=3.2.6 \
+    RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.2 \
+    GOLANG_VERSION=1.23.3 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.5.1 \
-    GITALY_SERVER_VERSION=17.5.1 \
+    GITLAB_PAGES_VERSION=17.5.2 \
+    GITALY_SERVER_VERSION=17.5.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c52414412..a323c8a81 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.5.1
+# sameersbn/gitlab:17.5.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.1
+docker pull sameersbn/gitlab:17.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.5.1
+ sameersbn/gitlab:17.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.5.1
+    sameersbn/gitlab:17.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:sanitize
+    sameersbn/gitlab:17.5.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake db:setup
+    sameersbn/gitlab:17.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.1
+docker pull sameersbn/gitlab:17.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9cbaf2372..808ab16be 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.5.1
+17.5.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b574fe5cd..5b6da82d8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e8a995bb1..d7943286b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 65f5144c1..5bfb1a5d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d84ab8264..1bf3a638f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.1
+docker pull sameersbn/gitlab:17.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.5.1
+sameersbn/gitlab:17.5.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d1e2b7a50..6e7b6eb63 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ff31ba787..e2784034d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.1
+    image: sameersbn/gitlab:17.5.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c9e34f194..3d534c662 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.5.1
+        image: sameersbn/gitlab:17.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 41ad9da1b2d33b070e63c7898cf1ccd416423ee6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 22 Nov 2024 23:05:01 +0100
Subject: [PATCH 0988/1124] Upgrade GitLab CE to 17.6.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9e1644972..f83883450 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.6.0**
+
+- gitlab: upgrade CE to v17.6.0
+- gitaly: upgrade to v17.6.0
+- gitlab-pages: upgrade to v17.6.0
+
 **17.5.2**
 
 - gitlab: upgrade CE to v17.5.2
diff --git a/Dockerfile b/Dockerfile
index ef4b9d58a..718121b7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.5.2
+ARG VERSION=17.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.3 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.5.2 \
-    GITALY_SERVER_VERSION=17.5.2 \
+    GITLAB_PAGES_VERSION=17.6.0 \
+    GITALY_SERVER_VERSION=17.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a323c8a81..60df0cdea 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.5.2
+# sameersbn/gitlab:17.6.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.2
+docker pull sameersbn/gitlab:17.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.5.2
+ sameersbn/gitlab:17.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.5.2
+    sameersbn/gitlab:17.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:sanitize
+    sameersbn/gitlab:17.6.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake db:setup
+    sameersbn/gitlab:17.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.2
+docker pull sameersbn/gitlab:17.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 808ab16be..ea3bf215c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.5.2
+17.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5b6da82d8..383a26112 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d7943286b..04f0f2bf0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5bfb1a5d8..f37870d35 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1bf3a638f..b1544804a 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.5.2
+docker pull sameersbn/gitlab:17.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.5.2
+sameersbn/gitlab:17.6.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 6e7b6eb63..f5ab8beca 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e2784034d..e288fbba1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.5.2
+    image: sameersbn/gitlab:17.6.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3d534c662..12baa0c99 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.5.2
+        image: sameersbn/gitlab:17.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 98235b9d0962293d1b43aba2ed3f62b283ded506 Mon Sep 17 00:00:00 2001
From: Thomas Hiller <thomas.hiller@gmx.de>
Date: Tue, 7 Jan 2025 22:14:24 +0100
Subject: [PATCH 0989/1124] set larger resource class; change to buildx; all
 for th-2021

---
 .circleci/config.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b72efbdaf..47204bf3d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   shellcheck: circleci/shellcheck@3.2.0
-  docker: circleci/docker@2.5.0
+  docker: circleci/docker@2.8.1
   go: circleci/go@1.11.0
 
 commands:
@@ -11,7 +11,7 @@ commands:
       Build and optionally deploy a Docker images
     parameters:
       dockerfile:
-        default: Dockerfile
+        default: Dockerfile.multistage
         description: 'Name of dockerfile to use, defaults to Dockerfile'
         type: string
       extra_build_args:
@@ -50,6 +50,11 @@ commands:
         description: |
           No output timeout for build step
         type: string
+      use-buildkit:
+        default: false
+        description: |
+          Use buildkit to build the image. Available on Docker >= 18.09.0 https://docs.docker.com/develop/develop-images/build_enhancements/
+        type: boolean
     steps:
       - when:
           condition: <<parameters.cache_from>>
@@ -76,7 +81,7 @@ commands:
                     done
                   done
 
-                  docker build
+                  docker buildx build
                   <<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
                   \
                     --cache-from <<parameters.cache_from>> \
@@ -102,7 +107,7 @@ commands:
                     done
                   done
 
-                  docker build
+                  docker buildx build
                   <<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
                   \
                     -f <<parameters.path>>/<<parameters.dockerfile>> \
@@ -198,7 +203,9 @@ commands:
 
 jobs:
   build:
-    executor: docker/machine
+    machine:
+      image: ubuntu-2404:edge
+    resource_class: large
     steps:
       - checkout
       - docker-build:
@@ -208,6 +215,7 @@ jobs:
           cache_from: docker.io/sameersbn/gitlab:latest
           extra_build_args: '--build-arg VCS_REF=${CIRCLE_TAG:-${CIRCLE_SHA1}} --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"'
           no_output_timeout: 45m
+          use-buildkit: true
       - docker-save:
           registry: docker.io,quay.io
           image: sameersbn/gitlab

From 1b0604aa6ed1e16259bd83ee2e7c15d2ea4c7cac Mon Sep 17 00:00:00 2001
From: Thomas Hiller <thomas.hiller@gmx.de>
Date: Tue, 14 Jan 2025 17:25:55 +0100
Subject: [PATCH 0990/1124] fix Dockerfile name

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47204bf3d..747df192c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ commands:
       Build and optionally deploy a Docker images
     parameters:
       dockerfile:
-        default: Dockerfile.multistage
+        default: Dockerfile
         description: 'Name of dockerfile to use, defaults to Dockerfile'
         type: string
       extra_build_args:

From a7c29209ca8ac79e876fba8cce70ccf6f2b095fa Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Jan 2025 16:29:33 +0100
Subject: [PATCH 0991/1124] Upgrade GitLab CE to 17.6.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f83883450..846cef675 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,13 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.6.1**
+
+- gitlab: upgrade CE to v17.6.1
+- gitlab-pages: upgrade to v17.6.1
+- gitaly: upgrade to v17.6.1
+- golang: upgrade to v1.23.5
+
 **17.6.0**
 
 - gitlab: upgrade CE to v17.6.0
diff --git a/Dockerfile b/Dockerfile
index 718121b7d..dea8fc385 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.6.0
+ARG VERSION=17.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
     RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.3 \
+    GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.6.0 \
-    GITALY_SERVER_VERSION=17.6.0 \
+    GITLAB_PAGES_VERSION=17.6.1 \
+    GITALY_SERVER_VERSION=17.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 60df0cdea..90b3d0116 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.6.0
+# sameersbn/gitlab:17.6.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.0
+docker pull sameersbn/gitlab:17.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.6.0
+ sameersbn/gitlab:17.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.6.0
+    sameersbn/gitlab:17.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:sanitize
+    sameersbn/gitlab:17.6.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake db:setup
+    sameersbn/gitlab:17.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.0
+docker pull sameersbn/gitlab:17.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ea3bf215c..473655ef2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.6.0
+17.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 383a26112..62a7c6445 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 04f0f2bf0..44809832b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f37870d35..261a08872 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b1544804a..cb35f12ab 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.0
+docker pull sameersbn/gitlab:17.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.6.0
+sameersbn/gitlab:17.6.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f5ab8beca..809fb24b6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e288fbba1..87a7cb28d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.0
+    image: sameersbn/gitlab:17.6.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 12baa0c99..e9e4f0ea7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.6.0
+        image: sameersbn/gitlab:17.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From e69b6250f76217b65f61335c64a32139e4248937 Mon Sep 17 00:00:00 2001
From: Patrick Remy <remy@divera.gmbh>
Date: Tue, 17 Dec 2024 10:29:06 +0100
Subject: [PATCH 0992/1124] Upgrade GitLab CE to 17.6.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 846cef675..463e4d689 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.6.2**
+
+- gitlab: upgrade CE to v17.6.2
+- gitaly: upgrade to v17.6.2
+- gitlab-pages: upgrade to v17.6.2
+
 **17.6.1**
 
 - gitlab: upgrade CE to v17.6.1
diff --git a/Dockerfile b/Dockerfile
index dea8fc385..f8ca610f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.6.1
+ARG VERSION=17.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.6.1 \
-    GITALY_SERVER_VERSION=17.6.1 \
+    GITLAB_PAGES_VERSION=17.6.2 \
+    GITALY_SERVER_VERSION=17.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 90b3d0116..a30b7f7fb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.6.1
+# sameersbn/gitlab:17.6.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.1
+docker pull sameersbn/gitlab:17.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.6.1
+ sameersbn/gitlab:17.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.6.1
+    sameersbn/gitlab:17.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:sanitize
+    sameersbn/gitlab:17.6.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake db:setup
+    sameersbn/gitlab:17.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.1
+docker pull sameersbn/gitlab:17.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 473655ef2..b3b459a89 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.6.1
+17.6.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 62a7c6445..c18c41c67 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 44809832b..a05bfa390 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 261a08872..6df46d388 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cb35f12ab..9242557c1 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.1
+docker pull sameersbn/gitlab:17.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.6.1
+sameersbn/gitlab:17.6.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 809fb24b6..cf6380ad7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 87a7cb28d..c9903c2a9 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.1
+    image: sameersbn/gitlab:17.6.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e9e4f0ea7..e62ac07b3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.6.1
+        image: sameersbn/gitlab:17.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 6a2e2356c78ebdab2c8b9d5284af543fb5847e92 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Jan 2025 18:22:08 +0100
Subject: [PATCH 0993/1124] Upgrade GitLab CE to 17.6.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 463e4d689..f334ad496 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,12 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.6.3**
+
+- gitlab: upgrade CE to v17.6.3
+- gitaly: upgrade to v17.6.3
+- gitlab-pages: upgrade to v17.6.3
+
 **17.6.2**
 
 - gitlab: upgrade CE to v17.6.2
diff --git a/Dockerfile b/Dockerfile
index f8ca610f3..38576edc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.6.2
+ARG VERSION=17.6.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.6.2 \
-    GITALY_SERVER_VERSION=17.6.2 \
+    GITLAB_PAGES_VERSION=17.6.3 \
+    GITALY_SERVER_VERSION=17.6.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index a30b7f7fb..e36dc245a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.6.2
+# sameersbn/gitlab:17.6.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.2
+docker pull sameersbn/gitlab:17.6.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.6.2
+ sameersbn/gitlab:17.6.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.6.2
+    sameersbn/gitlab:17.6.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:sanitize
+    sameersbn/gitlab:17.6.3 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake db:setup
+    sameersbn/gitlab:17.6.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.6.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.2
+docker pull sameersbn/gitlab:17.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.3
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b3b459a89..a58b3b812 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.6.2
+17.6.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c18c41c67..0d0790bd3 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a05bfa390..25ddf4bce 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6df46d388..d99548015 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9242557c1..b72f8c4c9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.2
+docker pull sameersbn/gitlab:17.6.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.6.2
+sameersbn/gitlab:17.6.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cf6380ad7..3dda67056 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c9903c2a9..8b5637059 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.2
+    image: sameersbn/gitlab:17.6.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e62ac07b3..21056bc81 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.6.2
+        image: sameersbn/gitlab:17.6.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 0b9455326491c7076f74c2be158e2659de055ef8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Jan 2025 23:19:05 +0100
Subject: [PATCH 0994/1124] Upgrade GitLab CE to 17.7.0

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 38576edc6..7169f984b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal-20241011
 
-ARG VERSION=17.6.3
+ARG VERSION=17.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.6.3 \
-    GITALY_SERVER_VERSION=17.6.3 \
+    GITLAB_PAGES_VERSION=17.7.0 \
+    GITALY_SERVER_VERSION=17.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

From b95972568aa7a93768f9fa0ef62c64ba47a6a030 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Jan 2025 23:28:39 +0100
Subject: [PATCH 0995/1124] Change base image from focal to jammy

---
 Dockerfile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7169f984b..ccfef2e7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20241011
+FROM ubuntu:jammy-20240911.1
 
 ARG VERSION=17.7.0
 
@@ -32,11 +32,11 @@ RUN apt-get update \
 
 RUN set -ex && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
- && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal main" >> /etc/apt/sources.list \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \
- && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal main" >> /etc/apt/sources.list \
+ && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv ABF5BD827BD9BF62 \
+ && echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
- && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \
  && echo 'deb https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
@@ -46,12 +46,13 @@ RUN set -ex && \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
       nginx openssh-server postgresql-contrib redis-tools \
-      postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 \
+      postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 postgresql-client-17 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
-      libpq5 zlib1g libyaml-0-2 libssl1.1 \
-      libgdbm6 libreadline8 libncurses5 libffi7 \
-      libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \
-      libmagic1 \
+      libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \
+      libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev \
+      libcurl4-openssl-dev libicu-dev libkrb5-dev rsync python3-docutils pkg-config cmake \
+      runit-systemd \
+      tzdata unzip libimage-exiftool-perl libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \

From 3cde3caf984e6baead98465ef61726765795ae22 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 19 Jan 2025 17:57:48 +0900
Subject: [PATCH 0996/1124] update patch
 0003-fix_preinstall.mjs-to-avoid-removing-node_modules-dir.patch

File updated
No changes to the scripts we want to modify

- Simplify fileURLToPath usage in scripts
  https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173402
  especially in commit https://gitlab.com/gitlab-org/gitlab/-/commit/462273d2ba17d2a506caf962830344798b1598cc
  first contained in : v17.7.0-ee
---
 ...stall.mjs-to-avoid-removing-node_modules_dir.patch | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
index a5646ff38..3aba9e8f6 100644
--- a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
+++ b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
@@ -1,16 +1,15 @@
 diff --git a/scripts/frontend/preinstall.mjs b/scripts/frontend/preinstall.mjs
-index 09d980344eac..b1514e803b75 100644
+index e86525cd20d2..f849c423f1b6 100644
 --- a/scripts/frontend/preinstall.mjs
 +++ b/scripts/frontend/preinstall.mjs
-@@ -1,6 +1,6 @@
- import { dirname, join } from 'node:path';
- import { fileURLToPath } from 'node:url';
+@@ -1,5 +1,5 @@
+ import { join } from 'node:path';
 -import { readFile, rm } from 'node:fs/promises';
 +import { readdir, readFile, rm, stat } from 'node:fs/promises';
  
- const ROOT_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
+ const ROOT_PATH = join(import.meta.dirname, '..', '..');
  const NODE_MODULES = join(ROOT_PATH, 'node_modules');
-@@ -55,5 +55,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) {
+@@ -54,5 +54,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) {
    console.error(
      '[WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems.',
    );

From 32b38f464d8fc863b01415046369f1cc002ee66d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 19 Jan 2025 21:42:44 +0900
Subject: [PATCH 0997/1124] delete additional nginx repo

as default ppa repository for ubuntu jammy provides
suitable version of nginx ( >= 1.12.1)
---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ccfef2e7b..e3a3ef38f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,8 +33,6 @@ RUN apt-get update \
 RUN set -ex && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
  && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv ABF5BD827BD9BF62 \
- && echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \

From d7c39972853659ae7fa330a678fe147133e4642d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 19 Jan 2025 22:39:12 +0900
Subject: [PATCH 0998/1124] remove libyaml-dev from BUILD_DEPENDENCIES

Because this is required on runtime
and BUILD_DEPENDENCIES will be removed at the end of installation
Installation of `libyaml-dev` is written in Dockerfile
so additional installation is not reeded

if not, following error reported on runtime

> LoadError: libyaml-0.so.2: cannot open shared object file: No such or directory - /usr/local/lib/ruby/3.2.0/x86_64-linux/psych.so

This is because Ruby 3.2.0 (psych 5.0.0) or later
does not contain libyaml any more
https://github.com/ruby/psych/pull/541
---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 47fc46202..e76c823f0 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -21,7 +21,7 @@ export GOROOT PATH
 
 BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
   libc6-dev \
-  libpq-dev zlib1g-dev libyaml-dev libssl-dev \
+  libpq-dev zlib1g-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
   libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \
   gettext libkrb5-dev \

From 049df9a1200a1dea4b95a892ca05db5ff4c0b1b9 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sun, 19 Jan 2025 22:47:47 +0900
Subject: [PATCH 0999/1124] Just use result of $(command -v pg_isready)

instead of `find /usr/lib/postgresql -name pg_isready | sort | tail -n1`
for db readiness query command
To solve following error:

    find /var/lib/postgresql : No such file or directory

I'm sure the directory is exists so I'm not sure why the error reported
---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 67750f2f7..9bf91bbb1 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -149,7 +149,7 @@ gitlab_finalize_database_parameters() {
 
 gitlab_check_database_connection() {
 
-  prog=$(find /usr/lib/postgresql/ -name pg_isready -type f | sort | tail -n1)
+  prog=$(command -v pg_isready)
   prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1"
 
   timeout=60

From 6021babd92202cee45230b6ddd4f0483cbff47e5 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 21 Jan 2025 19:27:03 +0100
Subject: [PATCH 1000/1124] Update documentation

---
 Changelog.md                            | 11 ++++-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 10 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f334ad496..1a1801617 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,15 @@
 # Changelog
 
-This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
+gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
+
+**17.7.0**
+
+- gitlab: upgrade CE to v17.7.0
+- gitaly: upgrade to v17.7.0
+- gitlab-pages: upgrade to v17.7.0
+- ubuntu: upgrade to jammy-20240911.1
+- update healthcheck for postgresql
 
 **17.6.3**
 
diff --git a/README.md b/README.md
index e36dc245a..3320c41a7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.6.3
+# sameersbn/gitlab:17.7.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.3
+docker pull sameersbn/gitlab:17.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.6.3
+ sameersbn/gitlab:17.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.6.3
+    sameersbn/gitlab:17.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:sanitize
+    sameersbn/gitlab:17.7.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake db:setup
+    sameersbn/gitlab:17.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:env:info
+    sameersbn/gitlab:17.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.6.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.3
+docker pull sameersbn/gitlab:17.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a58b3b812..2d573323c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.6.3
+17.7.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0d0790bd3..43c957c71 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 25ddf4bce..acc107ec1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d99548015..a0120696f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index b72f8c4c9..c77785779 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.6.3
+docker pull sameersbn/gitlab:17.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.6.3
+sameersbn/gitlab:17.7.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3dda67056..777e75e44 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 8b5637059..6cb2e715c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.6.3
+    image: sameersbn/gitlab:17.7.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 21056bc81..42fdabf2d 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.6.3
+        image: sameersbn/gitlab:17.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ccd752499a76b2bf7ec16ab557cf2a9444d17b5d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 21 Jan 2025 21:25:04 +0100
Subject: [PATCH 1001/1124] Upgrade GitLab CE to 17.7.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1a1801617..d93035fc8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.7.1**
+
+- gitlab: upgrade CE to v17.7.1
+- gitaly: upgrade to v17.7.1
+- gitlab-pages: upgrade to v17.7.1
+
 **17.7.0**
 
 - gitlab: upgrade CE to v17.7.0
diff --git a/Dockerfile b/Dockerfile
index e3a3ef38f..a2685ff02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20240911.1
 
-ARG VERSION=17.7.0
+ARG VERSION=17.7.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.7.0 \
-    GITALY_SERVER_VERSION=17.7.0 \
+    GITLAB_PAGES_VERSION=17.7.1 \
+    GITALY_SERVER_VERSION=17.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3320c41a7..ddf711291 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.7.0
+# sameersbn/gitlab:17.7.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.0
+docker pull sameersbn/gitlab:17.7.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.7.0
+ sameersbn/gitlab:17.7.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.7.0
+    sameersbn/gitlab:17.7.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:sanitize
+    sameersbn/gitlab:17.7.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake db:setup
+    sameersbn/gitlab:17.7.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.7.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.0
+docker pull sameersbn/gitlab:17.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2d573323c..c15d655d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.7.0
+17.7.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 43c957c71..173e6e9d6 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index acc107ec1..eba79c490 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a0120696f..7e12df333 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c77785779..1981e0acc 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.0
+docker pull sameersbn/gitlab:17.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.7.0
+sameersbn/gitlab:17.7.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 777e75e44..a227852a3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6cb2e715c..56f3bd918 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.0
+    image: sameersbn/gitlab:17.7.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 42fdabf2d..014a956aa 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.7.0
+        image: sameersbn/gitlab:17.7.1
         env:
         - name: TZ
           value: Asia/Kolkata

From aec6003457368c5fd6232936d5b810b68d63a137 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 21 Jan 2025 22:41:45 +0100
Subject: [PATCH 1002/1124] Upgrade GitLab CE to 17.8.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d93035fc8..267b1aecc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.8.0**
+
+- gitlab: upgrade CE to v17.8.0
+- gitaly: upgrade to v17.8.0
+- gitlab-pages: upgrade to v17.8.0
+
 **17.7.1**
 
 - gitlab: upgrade CE to v17.7.1
diff --git a/Dockerfile b/Dockerfile
index a2685ff02..c871b288f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20240911.1
 
-ARG VERSION=17.7.1
+ARG VERSION=17.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.7.1 \
-    GITALY_SERVER_VERSION=17.7.1 \
+    GITLAB_PAGES_VERSION=17.8.0 \
+    GITALY_SERVER_VERSION=17.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ddf711291..2eccf411e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.7.1
+# sameersbn/gitlab:17.8.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.1
+docker pull sameersbn/gitlab:17.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.7.1
+ sameersbn/gitlab:17.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.7.1
+    sameersbn/gitlab:17.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:sanitize
+    sameersbn/gitlab:17.8.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake db:setup
+    sameersbn/gitlab:17.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.1
+docker pull sameersbn/gitlab:17.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c15d655d4..6fb9581dc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.7.1
+17.8.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 173e6e9d6..ede243831 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index eba79c490..19045a4ad 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e12df333..685ed8439 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1981e0acc..a23150422 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.7.1
+docker pull sameersbn/gitlab:17.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.7.1
+sameersbn/gitlab:17.8.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a227852a3..c7e8b302f 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 56f3bd918..1eb007416 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.7.1
+    image: sameersbn/gitlab:17.8.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 014a956aa..ac329921a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.7.1
+        image: sameersbn/gitlab:17.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 3cac65dd8849e44b1285b921329e75efa10018c0 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 27 Nov 2024 02:50:14 +0900
Subject: [PATCH 1003/1124] use `wget | gpg` instead of `apt-key`

warning: `apt-key` is deprecated
---
 Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c871b288f..893db3f70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,14 +31,15 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \
- && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
- && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
- && echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
- && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
- && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg  | apt-key add - \
- && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
+    mkdir -p /etc/apt/keyrings \
+ && wget --quiet -O - https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24 | gpg --dearmor -o /etc/apt/keyrings/git-core.gpg \
+ && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
+ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \
+ && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+ && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
+ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
+ && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && set -ex \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \

From f5e2572d7df80a4acaf49b0572972f883ae40dd0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Jan 2025 23:27:15 +0100
Subject: [PATCH 1004/1124] Upgrade GitLab CE to 17.8.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 267b1aecc..650fb6424 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.8.1**
+
+- gitlab: upgrade CE to v17.8.1
+- gitaly: upgrade to v17.8.1
+- gitlab-pages: upgrade to v17.8.1
+
 **17.8.0**
 
 - gitlab: upgrade CE to v17.8.0
diff --git a/Dockerfile b/Dockerfile
index 893db3f70..eb612ce4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20240911.1
 
-ARG VERSION=17.8.0
+ARG VERSION=17.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.6 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.14 \
     GOLANG_VERSION=1.23.5 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.8.0 \
-    GITALY_SERVER_VERSION=17.8.0 \
+    GITLAB_PAGES_VERSION=17.8.1 \
+    GITALY_SERVER_VERSION=17.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2eccf411e..ad9c9927b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.8.0
+# sameersbn/gitlab:17.8.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.0
+docker pull sameersbn/gitlab:17.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.8.0
+ sameersbn/gitlab:17.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.8.0
+    sameersbn/gitlab:17.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:sanitize
+    sameersbn/gitlab:17.8.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake db:setup
+    sameersbn/gitlab:17.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.0
+docker pull sameersbn/gitlab:17.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 6fb9581dc..d54380cde 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.8.0
+17.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ede243831..daee04686 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 19045a4ad..52bd5502d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 685ed8439..b193943e8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a23150422..2e73c4254 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.0
+docker pull sameersbn/gitlab:17.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.8.0
+sameersbn/gitlab:17.8.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c7e8b302f..04d2ad5a9 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1eb007416..dfcdd4839 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.0
+    image: sameersbn/gitlab:17.8.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ac329921a..550e08906 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.8.0
+        image: sameersbn/gitlab:17.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From c938f39377cf1d9f9c3cd095d38d4a833cfe0bd2 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 12 Feb 2025 23:09:44 +0100
Subject: [PATCH 1005/1124] Upgrade GitLab CE to 17.8.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 650fb6424..8e0aa6aee 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.8.2**
+
+- gitlab: upgrade CE to v17.8.2
+- gitaly: upgrade to v17.8.2
+- gitlab-pages: upgrade to v17.8.2
+- golang: upgrade to v1.23.6
+- ruby: upgrade to v3.2.7
+
 **17.8.1**
 
 - gitlab: upgrade CE to v17.8.1
diff --git a/Dockerfile b/Dockerfile
index eb612ce4d..d9d2ee771 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:jammy-20240911.1
 
-ARG VERSION=17.8.1
+ARG VERSION=17.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.6 \
-    RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \
+    RUBY_VERSION=3.2.7 \
+    RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \
     RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.5 \
+    GOLANG_VERSION=1.23.6 \
     GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.8.1 \
-    GITALY_SERVER_VERSION=17.8.1 \
+    GITLAB_PAGES_VERSION=17.8.2 \
+    GITALY_SERVER_VERSION=17.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ad9c9927b..43aedfed6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.8.1
+# sameersbn/gitlab:17.8.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.1
+docker pull sameersbn/gitlab:17.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.8.1
+ sameersbn/gitlab:17.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.8.1
+    sameersbn/gitlab:17.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:sanitize
+    sameersbn/gitlab:17.8.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake db:setup
+    sameersbn/gitlab:17.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.1
+docker pull sameersbn/gitlab:17.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d54380cde..0806c19f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.8.1
+17.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index daee04686..ca4f7bdc5 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 52bd5502d..d074b3a2b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b193943e8..24a4fed92 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 2e73c4254..840ff7324 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.1
+docker pull sameersbn/gitlab:17.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.8.1
+sameersbn/gitlab:17.8.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 04d2ad5a9..bca464a4a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index dfcdd4839..ceb5e62c2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.1
+    image: sameersbn/gitlab:17.8.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 550e08906..d8018c9ed 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.8.1
+        image: sameersbn/gitlab:17.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From b59c07574f71e7e92afe7bf54010be1125cbb84a Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 23 Jan 2025 08:49:37 +0900
Subject: [PATCH 1006/1124] Use official nginx repository

Set a higher priority so that it is used in preference to the
nginx packages provided by the ubuntu repository
---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index d9d2ee771..2985dfe47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,6 +40,9 @@ RUN set -ex && \
  && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
+ && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \
+ && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu jammy nginx" >> /etc/apt/sources.list.d/nginx.list \
+ && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" >> /etc/apt/preferences.d/99nginx \
  && set -ex \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \

From 9dff930f5f6facfdfbcf3046c99617f9b2e119df Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 23 Jan 2025 08:52:22 +0900
Subject: [PATCH 1007/1124] Change path to install nginx configuration

Directories such as /etc/nginx/sites-{enabled, available and similar}
are not available for nginx package comes from official nginx repository.

Ubuntu source may create this directory
refer1 : ubuntu distributes nginx with a file "nginx-common.dirs"
which lists these directories
https://git.launchpad.net/ubuntu/+source/nginx/tree/debian/nginx-common.dirs?h=ubuntu/jammy-updates

By default, nginx recognizes configuration files in /etc/nginx/conf.d/
Just change the destination path to install nginx configuration files
---
 assets/runtime/functions | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 9bf91bbb1..b32048fb8 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -23,10 +23,10 @@ GITLAB_ACTIONCABLE_CONFIG="${GITLAB_INSTALL_DIR}/config/cable.yml"
 GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml"
 GITLAB_ROBOTS_CONFIG="${GITLAB_INSTALL_DIR}/public/robots.txt"
 GITLAB_SHELL_CONFIG="${GITLAB_SHELL_INSTALL_DIR}/config.yml"
-GITLAB_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab"
-GITLAB_CI_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab_ci"
-GITLAB_REGISTRY_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-registry"
-GITLAB_PAGES_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-pages"
+GITLAB_NGINX_CONFIG="/etc/nginx/conf.d/gitlab.conf"
+GITLAB_CI_NGINX_CONFIG="/etc/nginx/conf.d/gitlab_ci.conf"
+GITLAB_REGISTRY_NGINX_CONFIG="/etc/nginx/conf.d/gitlab-registry.conf"
+GITLAB_PAGES_NGINX_CONFIG="/etc/nginx/conf.d/gitlab-pages.conf"
 GITLAB_PAGES_CONFIG="${GITLAB_INSTALL_DIR}/gitlab-pages-config"
 GITLAB_GITALY_CONFIG="${GITLAB_GITALY_INSTALL_DIR}/config.toml"
 

From fc0012a696fd8acabbd09a73e3c811981b25a930 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Wed, 22 Jan 2025 19:47:20 +0900
Subject: [PATCH 1008/1124] Change nginx log format name from main

it reports error as it is duplicated
---
 assets/runtime/config/nginx/gitlab          | 4 ++--
 assets/runtime/config/nginx/gitlab-registry | 4 ++--
 assets/runtime/config/nginx/gitlab-ssl      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index c2e22a297..75001235e 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -30,7 +30,7 @@ map $request_uri $obfuscated_request_uri {
     ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4;
     default $request_uri;
 }
-log_format main '$remote_addr - $remote_user [$time_local] '
+log_format gitlab_access '$remote_addr - $remote_user [$time_local] '
                   '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent '
                   '"$http_referer" "$http_user_agent"';
 
@@ -58,7 +58,7 @@ server {
   add_header Strict-Transport-Security "max-age={{NGINX_HSTS_MAXAGE}};";
 
   ## Individual nginx logs for this GitLab vhost
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_access;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 
   location / {
diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index 280436561..b37aac542 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -11,7 +11,7 @@ server {
   server_name  {{GITLAB_REGISTRY_HOST}};
   server_tokens off; ## Don't show the nginx version number, a security best practice
   return 301 https://$http_host:$request_uri;
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
 }
 
@@ -36,7 +36,7 @@ server {
   ssl_session_cache  builtin:1000  shared:SSL:10m;
   ssl_session_timeout  5m;
 
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
 
   location / {
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 893232b72..df349ec9b 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -34,7 +34,7 @@ map $request_uri $obfuscated_request_uri {
     ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4;
     default $request_uri;
 }
-log_format main '$remote_addr - $remote_user [$time_local] '
+log_format gitlab_ssl_access '$remote_addr - $remote_user [$time_local] '
                   '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent '
                   '"$http_referer" "$http_user_agent"';
 
@@ -49,7 +49,7 @@ server {
   server_name _; ## Replace this with something like gitlab.example.com
   server_tokens off; ## Don't show the nginx version number, a security best practice
   return 301 https://$host:{{GITLAB_PORT}}$request_uri;
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_ssl_access;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 }
 
@@ -103,7 +103,7 @@ server {
   ssl_dhparam {{SSL_DHPARAM_PATH}};
 
   ## Individual nginx logs for this GitLab vhost
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_ssl_access;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log;
 
   location / {

From 928fc104d264075eb2885da8b91f938f5ccbe794 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Sat, 25 Jan 2025 00:30:02 +0900
Subject: [PATCH 1009/1124] Remove default nginx conf after installation

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

diff --git a/Dockerfile b/Dockerfile
index 2985dfe47..98dc8d680 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,7 @@ RUN set -ex && \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* /etc/nginx/conf.d/default.conf
 
 COPY assets/build/ ${GITLAB_BUILD_DIR}/
 RUN bash ${GITLAB_BUILD_DIR}/install.sh

From 2f38d3e57b729f803d130f5241aa63f81a86bf24 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 22 Feb 2025 16:50:33 +0100
Subject: [PATCH 1010/1124] Upgrade GitLab CE to 17.9.0

---
 Changelog.md                            | 10 +++++
 Dockerfile                              | 14 +++----
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8e0aa6aee..64898e287 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,16 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.9.0**
+
+- gitlab: upgrade CE to v17.9.0
+- gitaly: upgrade to v17.9.0
+- gitlab-pages: upgrade to v17.9.0
+- gitlab-shell: upgrade to v14.40.0
+- golang: upgrade to v1.24.0
+- rubygems: upgrade to v3.5.23
+- ubuntu: upgrade to jammy-20250126
+
 **17.8.2**
 
 - gitlab: upgrade CE to v17.8.2
diff --git a/Dockerfile b/Dockerfile
index 98dc8d680..b318584e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:jammy-20240911.1
+FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.8.2
+ARG VERSION=17.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.7 \
     RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \
-    RUBYGEMS_VERSION=3.5.14 \
-    GOLANG_VERSION=1.23.6 \
-    GITLAB_SHELL_VERSION=14.39.0 \
-    GITLAB_PAGES_VERSION=17.8.2 \
-    GITALY_SERVER_VERSION=17.8.2 \
+    RUBYGEMS_VERSION=3.5.23 \
+    GOLANG_VERSION=1.24.0 \
+    GITLAB_SHELL_VERSION=14.40.0 \
+    GITLAB_PAGES_VERSION=17.9.0 \
+    GITALY_SERVER_VERSION=17.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 43aedfed6..c22ff6a0b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.8.2
+# sameersbn/gitlab:17.9.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.2
+docker pull sameersbn/gitlab:17.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.8.2
+ sameersbn/gitlab:17.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.8.2
+    sameersbn/gitlab:17.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:sanitize
+    sameersbn/gitlab:17.9.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake db:setup
+    sameersbn/gitlab:17.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.2
+docker pull sameersbn/gitlab:17.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 0806c19f6..297e3ef06 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.8.2
+17.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ca4f7bdc5..61d8adf80 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d074b3a2b..869525e0e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 24a4fed92..9a67575d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 840ff7324..c4026834f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.8.2
+docker pull sameersbn/gitlab:17.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.8.2
+sameersbn/gitlab:17.9.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index bca464a4a..5026de2c5 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ceb5e62c2..78aeebe88 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.8.2
+    image: sameersbn/gitlab:17.9.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d8018c9ed..ba4b32dcf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.8.2
+        image: sameersbn/gitlab:17.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From b9f87199195d0ba7f078e31c26557a8ffd421501 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 22 Feb 2025 20:09:00 +0100
Subject: [PATCH 1011/1124] Fix nginx configuration

---
 assets/runtime/config/nginx/gitlab-pages-ssl | 3 ++-
 assets/runtime/config/nginx/gitlab-registry  | 7 ++++---
 assets/runtime/config/nginx/gitlab-ssl       | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl
index d18956d3c..8563c1a92 100644
--- a/assets/runtime/config/nginx/gitlab-pages-ssl
+++ b/assets/runtime/config/nginx/gitlab-pages-ssl
@@ -23,7 +23,8 @@ server {
 ## Pages serving host
 server {
   listen 0.0.0.0:443 ssl;
-  listen [::]:443 ssl http2;
+  listen [::]:443 ssl;
+  http2 on;
 
   ## Replace this with something like pages.gitlab.com
   server_name ~^.*{{GITLAB_PAGES_DOMAIN}};
diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index b37aac542..ce98d045f 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -11,14 +11,15 @@ server {
   server_name  {{GITLAB_REGISTRY_HOST}};
   server_tokens off; ## Don't show the nginx version number, a security best practice
   return 301 https://$http_host:$request_uri;
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
 }
 
 server {
   # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182,
   # it should be declared here as well
-  listen *:{{GITLAB_REGISTRY_PORT}} ssl http2;
+  listen *:{{GITLAB_REGISTRY_PORT}} ssl;
+  http2 on;
   server_name  {{GITLAB_REGISTRY_HOST}};
   server_tokens off; ## Don't show the nginx version number, a security best practice
 
@@ -36,7 +37,7 @@ server {
   ssl_session_cache  builtin:1000  shared:SSL:10m;
   ssl_session_timeout  5m;
 
-  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access;
+  access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
 
   location / {
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index df349ec9b..1057e0926 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -55,8 +55,9 @@ server {
 
 ## HTTPS host
 server {
-  listen 0.0.0.0:443 ssl http2;
-  listen [::]:443 ipv6only=on ssl http2 default_server;
+  listen 0.0.0.0:443 ssl;
+  listen [::]:443 ipv6only=on ssl default_server;
+  http2 on;
   server_name {{GITLAB_HOST}}; ## Replace this with something like gitlab.example.com
   server_tokens off; ## Don't show the nginx version number, a security best practice
 

From 967e018156280cade71abb7fb19acfff73116298 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 27 Feb 2025 11:34:56 +0100
Subject: [PATCH 1012/1124] Upgrade GitLab CE to 17.9.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 64898e287..627e155ad 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.9.1**
+
+- gitlab: upgrade CE to v17.9.1
+- gitaly: upgrade to v17.9.1
+- gitlab-pages: upgrade to v17.9.1
+
 **17.9.0**
 
 - gitlab: upgrade CE to v17.9.0
diff --git a/Dockerfile b/Dockerfile
index b318584e8..fc79313ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.9.0
+ARG VERSION=17.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.7 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.23 \
     GOLANG_VERSION=1.24.0 \
     GITLAB_SHELL_VERSION=14.40.0 \
-    GITLAB_PAGES_VERSION=17.9.0 \
-    GITALY_SERVER_VERSION=17.9.0 \
+    GITLAB_PAGES_VERSION=17.9.1 \
+    GITALY_SERVER_VERSION=17.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c22ff6a0b..87baee611 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.9.0
+# sameersbn/gitlab:17.9.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.0
+docker pull sameersbn/gitlab:17.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.9.0
+ sameersbn/gitlab:17.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.9.0
+    sameersbn/gitlab:17.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:sanitize
+    sameersbn/gitlab:17.9.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake db:setup
+    sameersbn/gitlab:17.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.0
+docker pull sameersbn/gitlab:17.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 297e3ef06..8c1fac2ac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.9.0
+17.9.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 61d8adf80..1ab9faec0 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 869525e0e..c4209cbea 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a67575d6..639c24302 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c4026834f..944374676 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.0
+docker pull sameersbn/gitlab:17.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.9.0
+sameersbn/gitlab:17.9.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5026de2c5..aa183177d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 78aeebe88..61f99d5e2 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.0
+    image: sameersbn/gitlab:17.9.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ba4b32dcf..b90358558 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.9.0
+        image: sameersbn/gitlab:17.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From ef8807ec90242446026cf563f267256a1979e5e9 Mon Sep 17 00:00:00 2001
From: Nick <alfshek@hotmail.com>
Date: Thu, 13 Mar 2025 18:23:42 +0800
Subject: [PATCH 1013/1124] Upgrade GitLab CE to 17.9.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 8 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 627e155ad..e90e97bf0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.9.2**
+
+- gitlab: upgrade CE to v17.9.2
+- gitaly: upgrade to v17.9.2
+- gitlab-pages: upgrade to v17.9.2
+
 **17.9.1**
 
 - gitlab: upgrade CE to v17.9.1
diff --git a/Dockerfile b/Dockerfile
index fc79313ae..fe516d8c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.9.1
+ARG VERSION=17.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.7 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.5.23 \
     GOLANG_VERSION=1.24.0 \
     GITLAB_SHELL_VERSION=14.40.0 \
-    GITLAB_PAGES_VERSION=17.9.1 \
-    GITALY_SERVER_VERSION=17.9.1 \
+    GITLAB_PAGES_VERSION=17.9.2 \
+    GITALY_SERVER_VERSION=17.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 87baee611..02d6b0b53 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.9.1
+# sameersbn/gitlab:17.9.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.1
+docker pull sameersbn/gitlab:17.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.9.1
+ sameersbn/gitlab:17.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.9.1
+    sameersbn/gitlab:17.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:sanitize
+    sameersbn/gitlab:17.9.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake db:setup
+    sameersbn/gitlab:17.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.1
+docker pull sameersbn/gitlab:17.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 8c1fac2ac..b2a95e29c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.9.1
+17.9.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1ab9faec0..61b9c77c7 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c4209cbea..221d816c1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 639c24302..cc1affe1f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.9.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 61f99d5e2..cbf30e533 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.9.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab

From 76c336c02ca1e9b5987e9b330d2090c2f18dc6c3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 20 Mar 2025 16:26:21 +0100
Subject: [PATCH 1014/1124] Upgrade GitLab CE to 17.10.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e90e97bf0..076c55f79 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.10.0**
+
+- gitlab: upgrade CE to v17.10.0
+- gitaly: upgrade to v17.10.0
+- gitlab-pages: upgrade to v17.10.0
+- golang: upgrade to v1.24.1
+- rubygems: upgrade to v3.6.6
+
 **17.9.2**
 
 - gitlab: upgrade CE to v17.9.2
diff --git a/Dockerfile b/Dockerfile
index fe516d8c3..978f94d04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.9.2
+ARG VERSION=17.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.7 \
     RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \
-    RUBYGEMS_VERSION=3.5.23 \
-    GOLANG_VERSION=1.24.0 \
-    GITLAB_SHELL_VERSION=14.40.0 \
-    GITLAB_PAGES_VERSION=17.9.2 \
-    GITALY_SERVER_VERSION=17.9.2 \
+    RUBYGEMS_VERSION=3.6.6 \
+    GOLANG_VERSION=1.24.1 \
+    GITLAB_SHELL_VERSION=14.41.0 \
+    GITLAB_PAGES_VERSION=17.10.0 \
+    GITALY_SERVER_VERSION=17.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 02d6b0b53..76b80f022 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.9.2
+# sameersbn/gitlab:17.10.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.2
+docker pull sameersbn/gitlab:17.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.9.2
+ sameersbn/gitlab:17.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.9.2
+    sameersbn/gitlab:17.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:sanitize
+    sameersbn/gitlab:17.10.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake db:setup
+    sameersbn/gitlab:17.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:17.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.2
+docker pull sameersbn/gitlab:17.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.9.2
+    image: sameersbn/gitlab:17.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b2a95e29c..d30bd38d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.9.2
+17.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 61b9c77c7..1a6b63b84 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.2
+    image: sameersbn/gitlab:17.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 221d816c1..3880ffdba 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.9.2
+    image: sameersbn/gitlab:17.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cc1affe1f..ddc5b607f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.2
+    image: sameersbn/gitlab:17.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 944374676..fcd6f26da 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.9.1
+docker pull sameersbn/gitlab:17.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.9.1
+sameersbn/gitlab:17.10.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index aa183177d..35a8734d3 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.1
+    image: sameersbn/gitlab:17.10.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cbf30e533..bdd2d528d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.9.2
+    image: sameersbn/gitlab:17.10.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b90358558..d18666c07 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.9.1
+        image: sameersbn/gitlab:17.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 8d1e4bafcd93e11f6b5a511f3eddafe7a214dede Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 30 Mar 2025 10:35:12 +0200
Subject: [PATCH 1015/1124] Upgrade GitLab CE to 17.10.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 076c55f79..17d5bf9f2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.10.1**
+
+- gitlab: upgrade CE to v17.10.1
+- gitaly: upgrade to v17.10.1
+- gitlab-pages: upgrade to v17.10.1
+
 **17.10.0**
 
 - gitlab: upgrade CE to v17.10.0
diff --git a/Dockerfile b/Dockerfile
index 978f94d04..b9ba847a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.10.0
+ARG VERSION=17.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.7 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.6.6 \
     GOLANG_VERSION=1.24.1 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.10.0 \
-    GITALY_SERVER_VERSION=17.10.0 \
+    GITLAB_PAGES_VERSION=17.10.1 \
+    GITALY_SERVER_VERSION=17.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 76b80f022..798a81b3d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.10.0
+# sameersbn/gitlab:17.10.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.0
+docker pull sameersbn/gitlab:17.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.10.0
+ sameersbn/gitlab:17.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.10.0
+    sameersbn/gitlab:17.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:sanitize
+    sameersbn/gitlab:17.10.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake db:setup
+    sameersbn/gitlab:17.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.0
+docker pull sameersbn/gitlab:17.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d30bd38d6..60d8373f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.0
+17.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1a6b63b84..935de890b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 3880ffdba..6e358024f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ddc5b607f..d0d1dd86d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fcd6f26da..3f753c4ba 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.0
+docker pull sameersbn/gitlab:17.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.10.0
+sameersbn/gitlab:17.10.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 35a8734d3..3305d94ac 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index bdd2d528d..0a3c67c8a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.0
+    image: sameersbn/gitlab:17.10.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index d18666c07..dacf83b72 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.10.0
+        image: sameersbn/gitlab:17.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From dec08eeff24cdf8297eeadfe53a7f3ecdd1d1c36 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 3 Apr 2025 05:21:45 +0200
Subject: [PATCH 1016/1124] Upgrade GitLab CE to 17.10.3

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 17d5bf9f2..22d7e5435 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.10.3**
+
+- gitlab: upgrade CE to v17.10.3
+- gitaly: upgrade to v17.10.3
+- gitlab-pages: upgrade to v17.10.3
+- golang: upgrade to v1.24.2
+- ruby: upgrade to v3.2.8
+
 **17.10.1**
 
 - gitlab: upgrade CE to v17.10.1
diff --git a/Dockerfile b/Dockerfile
index b9ba847a0..181fbe3c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:jammy-20250126
 
-ARG VERSION=17.10.1
+ARG VERSION=17.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.7 \
-    RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \
+    RUBY_VERSION=3.2.8 \
+    RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
     RUBYGEMS_VERSION=3.6.6 \
-    GOLANG_VERSION=1.24.1 \
+    GOLANG_VERSION=1.24.2 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.10.1 \
-    GITALY_SERVER_VERSION=17.10.1 \
+    GITLAB_PAGES_VERSION=17.10.3 \
+    GITALY_SERVER_VERSION=17.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 798a81b3d..542839c3f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.10.1
+# sameersbn/gitlab:17.10.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.1
+docker pull sameersbn/gitlab:17.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.10.1
+ sameersbn/gitlab:17.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.10.1
+    sameersbn/gitlab:17.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:sanitize
+    sameersbn/gitlab:17.10.3 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake db:setup
+    sameersbn/gitlab:17.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.1
+docker pull sameersbn/gitlab:17.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.3
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 60d8373f8..76df87fc2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.1
+17.10.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 935de890b..a6bd345ad 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 6e358024f..13f8e1ebc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d0d1dd86d..129119099 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3f753c4ba..6b21a68b2 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.1
+docker pull sameersbn/gitlab:17.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.10.1
+sameersbn/gitlab:17.10.3
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 3305d94ac..942116a2b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0a3c67c8a..43cc4e44c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.1
+    image: sameersbn/gitlab:17.10.3
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dacf83b72..3a265500e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.10.1
+        image: sameersbn/gitlab:17.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From 1dc3980701d4de31249f6c1ab7a72dac762c1ae6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 11 Apr 2025 05:05:46 +0200
Subject: [PATCH 1017/1124] Upgrade GitLab CE to 17.10.4

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 22d7e5435..96aa33ae4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.10.4**
+
+- gitlab: upgrade CE to v17.10.4
+- gitaly: upgrade to v17.10.4
+- gitlab-pages: upgrade to v17.10.4
+- ubuntu: upgrade to jammy-20250404
+
 **17.10.3**
 
 - gitlab: upgrade CE to v17.10.3
diff --git a/Dockerfile b/Dockerfile
index 181fbe3c6..931e1a99a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:jammy-20250126
+FROM ubuntu:jammy-20250404
 
-ARG VERSION=17.10.3
+ARG VERSION=17.10.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.6.6 \
     GOLANG_VERSION=1.24.2 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.10.3 \
-    GITALY_SERVER_VERSION=17.10.3 \
+    GITLAB_PAGES_VERSION=17.10.4 \
+    GITALY_SERVER_VERSION=17.10.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 542839c3f..3d07517c3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.10.3
+# sameersbn/gitlab:17.10.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.3
+docker pull sameersbn/gitlab:17.10.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.10.3
+ sameersbn/gitlab:17.10.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.10.3
+    sameersbn/gitlab:17.10.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:sanitize
+    sameersbn/gitlab:17.10.4 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake db:setup
+    sameersbn/gitlab:17.10.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:17.10.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.3
+docker pull sameersbn/gitlab:17.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.4
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 76df87fc2..2ba03104f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.3
+17.10.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a6bd345ad..de7be74b8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 13f8e1ebc..42f3fb206 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 129119099..4280864b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 6b21a68b2..965bb0feb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.3
+docker pull sameersbn/gitlab:17.10.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.10.3
+sameersbn/gitlab:17.10.4
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 942116a2b..7d67551f2 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 43cc4e44c..0d921783e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.3
+    image: sameersbn/gitlab:17.10.4
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 3a265500e..40fb80d2b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.10.3
+        image: sameersbn/gitlab:17.10.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 2d9b5fd8ca3d7f4a9d304b1a60b4945f00eb6026 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 18 Apr 2025 20:00:47 +0200
Subject: [PATCH 1018/1124] Upgrade GitLab CE to 17.11.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 96aa33ae4..5317cd06d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.11.0**
+
+- gitlab: upgrade CE to v17.11.0
+- gitaly: upgrade to v17.11.0
+- gitlab-pages: upgrade to v17.11.0
+
 **17.10.4**
 
 - gitlab: upgrade CE to v17.10.4
diff --git a/Dockerfile b/Dockerfile
index 931e1a99a..723448b80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy-20250404
 
-ARG VERSION=17.10.4
+ARG VERSION=17.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.6.6 \
     GOLANG_VERSION=1.24.2 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.10.4 \
-    GITALY_SERVER_VERSION=17.10.4 \
+    GITLAB_PAGES_VERSION=17.11.0 \
+    GITALY_SERVER_VERSION=17.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3d07517c3..bfca86cf8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.10.4
+# sameersbn/gitlab:17.11.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.4
+docker pull sameersbn/gitlab:17.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.10.4
+ sameersbn/gitlab:17.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.10.4
+    sameersbn/gitlab:17.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:sanitize
+    sameersbn/gitlab:17.11.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake db:setup
+    sameersbn/gitlab:17.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:env:info
+    sameersbn/gitlab:17.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.10.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.4
+docker pull sameersbn/gitlab:17.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 2ba03104f..903f9e3b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.4
+17.11.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index de7be74b8..da4975a46 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 42f3fb206..73a7733a0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4280864b3..edc89a8ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 965bb0feb..73c3633f6 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.10.4
+docker pull sameersbn/gitlab:17.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.10.4
+sameersbn/gitlab:17.11.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 7d67551f2..158d327fe 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0d921783e..4704c996c 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.10.4
+    image: sameersbn/gitlab:17.11.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 40fb80d2b..210b1a038 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.10.4
+        image: sameersbn/gitlab:17.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 145f1b08d99aeeea84ba00e9f7ff6736559a496f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Apr 2025 21:16:05 +0200
Subject: [PATCH 1019/1124] Upgrade GitLab CE to 17.11.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5317cd06d..5061c2dbb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.11.1**
+
+- gitlab: upgrade CE to v17.11.1
+- gitaly: upgrade to v17.11.1
+- gitlab-pages: upgrade to v17.11.1
+- rubygems: upgrade to v3.6.8
+
 **17.11.0**
 
 - gitlab: upgrade CE to v17.11.0
diff --git a/Dockerfile b/Dockerfile
index 723448b80..e751c431a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:jammy-20250404
 
-ARG VERSION=17.11.0
+ARG VERSION=17.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
-    RUBYGEMS_VERSION=3.6.6 \
+    RUBYGEMS_VERSION=3.6.8 \
     GOLANG_VERSION=1.24.2 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.11.0 \
-    GITALY_SERVER_VERSION=17.11.0 \
+    GITLAB_PAGES_VERSION=17.11.1 \
+    GITALY_SERVER_VERSION=17.11.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bfca86cf8..5c457d0fd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.11.0
+# sameersbn/gitlab:17.11.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.0
+docker pull sameersbn/gitlab:17.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.11.0
+ sameersbn/gitlab:17.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.11.0
+    sameersbn/gitlab:17.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:sanitize
+    sameersbn/gitlab:17.11.1 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake db:setup
+    sameersbn/gitlab:17.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:17.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.0
+docker pull sameersbn/gitlab:17.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.1
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 903f9e3b7..494afa45c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.11.0
+17.11.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index da4975a46..a148bb6d6 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 73a7733a0..c00189704 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index edc89a8ba..c861f1233 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 73c3633f6..fe4666073 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.0
+docker pull sameersbn/gitlab:17.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.11.0
+sameersbn/gitlab:17.11.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 158d327fe..8272653af 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4704c996c..f1a2f4517 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.0
+    image: sameersbn/gitlab:17.11.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 210b1a038..a4892bdf5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.11.0
+        image: sameersbn/gitlab:17.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 1b5a27d0d2033829ef95066cd733876c1131f451 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 9 May 2025 22:10:28 +0200
Subject: [PATCH 1020/1124] Upgrade GitLab CE to 17.11.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5061c2dbb..f827b48d7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**17.11.2**
+
+- gitlab: upgrade CE to v17.11.2
+- gitaly: upgrade to v17.11.2
+- gitlab-pages: upgrade to v17.11.2
+- golang: upgrade to v1.24.3
+- ubuntu: upgrade to jammy-20250415.1
+
 **17.11.1**
 
 - gitlab: upgrade CE to v17.11.1
diff --git a/Dockerfile b/Dockerfile
index e751c431a..39e1686fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:jammy-20250404
+FROM ubuntu:jammy-20250415.1
 
-ARG VERSION=17.11.1
+ARG VERSION=17.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
     RUBYGEMS_VERSION=3.6.8 \
-    GOLANG_VERSION=1.24.2 \
+    GOLANG_VERSION=1.24.3 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.11.1 \
-    GITALY_SERVER_VERSION=17.11.1 \
+    GITLAB_PAGES_VERSION=17.11.2 \
+    GITALY_SERVER_VERSION=17.11.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5c457d0fd..bd02a05c7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.11.1
+# sameersbn/gitlab:17.11.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.1
+docker pull sameersbn/gitlab:17.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.11.1
+ sameersbn/gitlab:17.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.11.1
+    sameersbn/gitlab:17.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:sanitize
+    sameersbn/gitlab:17.11.2 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake db:setup
+    sameersbn/gitlab:17.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:17.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:17.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.1
+docker pull sameersbn/gitlab:17.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.2
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 494afa45c..867f790a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.11.1
+17.11.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a148bb6d6..5b58b0dbc 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c00189704..171536157 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c861f1233..e9687f94a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index fe4666073..13aa87afd 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.1
+docker pull sameersbn/gitlab:17.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.11.1
+sameersbn/gitlab:17.11.2
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 8272653af..5314cf72a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f1a2f4517..f86f9b29b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.1
+    image: sameersbn/gitlab:17.11.2
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a4892bdf5..c47ce2e61 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.11.1
+        image: sameersbn/gitlab:17.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 77d781f066d9bdc3f0b4f1348341f374150ea23d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 19:57:52 +0200
Subject: [PATCH 1021/1124] Upgrade GitLab CE to 18.0.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 scripts/release-notes.sh                |  6 ++-
 12 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f827b48d7..9a523e7f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+**18.0.0**
+
+- gitlab: upgrade CE to v18.0.0
+- gitaly: upgrade to v18.0.0
+- gitlab-pages: upgrade to v18.0.0
+- rubygems: upgrade to v3.6.9
+- ubuntu: upgrade to noble-20250415.1
+
 **17.11.2**
 
 - gitlab: upgrade CE to v17.11.2
diff --git a/Dockerfile b/Dockerfile
index 39e1686fe..9bcff06df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:jammy-20250415.1
+FROM ubuntu:noble-20250415.1
 
-ARG VERSION=17.11.2
+ARG VERSION=18.0.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
-    RUBYGEMS_VERSION=3.6.8 \
+    RUBYGEMS_VERSION=3.6.9 \
     GOLANG_VERSION=1.24.3 \
     GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=17.11.2 \
-    GITALY_SERVER_VERSION=17.11.2 \
+    GITLAB_PAGES_VERSION=18.0.0 \
+    GITALY_SERVER_VERSION=18.0.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bd02a05c7..efeff910d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:17.11.2
+# sameersbn/gitlab:18.0.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 ### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 #### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 #### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:17.11.2
+ sameersbn/gitlab:18.0.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:17.11.2
+    sameersbn/gitlab:18.0.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:sanitize
+    sameersbn/gitlab:18.0.0 app:sanitize
 ```
 
 #### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake db:setup
+    sameersbn/gitlab:18.0.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2662,7 +2662,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.0.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:17.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.0
 ```
 
 ### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 867f790a8..7eae4e2e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.11.2
+18.0.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5b58b0dbc..49df8e03c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 171536157..706339d2b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e9687f94a..3e9e4a479 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 13aa87afd..b536dac6b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
 Execute the rake task with a removeable container.
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # Upgrading from an existing GitLab installation
@@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:17.11.2
+docker pull sameersbn/gitlab:18.0.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:17.11.2
+sameersbn/gitlab:18.0.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5314cf72a..b480118b7 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f86f9b29b..f879181f5 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:17.11.2
+    image: sameersbn/gitlab:18.0.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c47ce2e61..75988d916 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:17.11.2
+        image: sameersbn/gitlab:18.0.0
         env:
         - name: TZ
           value: Asia/Kolkata
diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 418a6dcf4..676b86459 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -41,8 +41,10 @@ Please note that this version does not yet include any rework as a consequence o
 Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance!
 
 Please note:
-- GitLab 17.x requires at least PostgreSQL 14.
-- See issues to be aware of when upgrading to 17.x : <https://docs.gitlab.com/ee/update/versions/gitlab_17_changes.html>
+
+- In GitLab 18.0 and later, [PostgreSQL 16 or later is required](https://docs.gitlab.com/install/installation/#software-requirements).
+- See issues to be aware of when upgrading: <https://docs.gitlab.com/update/>.
+
 
 ## Contributing
 

From d03645d1cf254c9ad82cbfb9729051cdafe4a866 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 20:08:33 +0200
Subject: [PATCH 1022/1124] Update ppa urls

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9bcff06df..6478597c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,15 +33,15 @@ RUN apt-get update \
 RUN set -ex && \
     mkdir -p /etc/apt/keyrings \
  && wget --quiet -O - https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24 | gpg --dearmor -o /etc/apt/keyrings/git-core.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu noble main" >> /etc/apt/sources.list \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \
- && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+ && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \
- && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu jammy nginx" >> /etc/apt/sources.list.d/nginx.list \
+ && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu noble nginx" >> /etc/apt/sources.list.d/nginx.list \
  && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" >> /etc/apt/preferences.d/99nginx \
  && set -ex \
  && apt-get update \

From d7171e5189ae8e011d6ee9b7f4c41b4f7b2e2adf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 20:22:54 +0200
Subject: [PATCH 1023/1124] Remove package 'runit-systemd'

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6478597c5..d56fa8040 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,7 +53,6 @@ RUN set -ex && \
       libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \
       libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev \
       libcurl4-openssl-dev libicu-dev libkrb5-dev rsync python3-docutils pkg-config cmake \
-      runit-systemd \
       tzdata unzip libimage-exiftool-perl libmagic1 \
  && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && locale-gen en_US.UTF-8 \

From 213293b6249113985fe26b6ec5bd17eedbd6a55f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 20:26:11 +0200
Subject: [PATCH 1024/1124] Update orb versions used by circleci

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 747df192c..b23690010 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  shellcheck: circleci/shellcheck@3.2.0
-  docker: circleci/docker@2.8.1
+  shellcheck: circleci/shellcheck@3.4.0
+  docker: circleci/docker@2.8.2
   go: circleci/go@1.11.0
 
 commands:

From b3247e4d036a5cdf81e28f21dc3a7f5a116ba93a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 20:34:10 +0200
Subject: [PATCH 1025/1124] Remove package 'paxctl'

---
 assets/build/install.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index e76c823f0..81b4201a1 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -19,7 +19,9 @@ PATH=${GOROOT}/bin:$PATH
 
 export GOROOT PATH
 
-BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
+# TODO Verify, if this is necessary or not.
+# BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \
+BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake \
   libc6-dev \
   libpq-dev zlib1g-dev libssl-dev \
   libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
@@ -59,13 +61,14 @@ cd "$PWD_ORG" && rm -rf /tmp/ruby
 # upgrade rubygems on demand
 gem update --no-document --system "${RUBYGEMS_VERSION}"
 
-# PaX-mark ruby
-# Applying the mark late here does make the build usable on PaX kernels, but
-# still the build itself must be executed on a non-PaX kernel. It's done here
-# only for simplicity.
-paxctl -cvm "$(command -v ruby)"
-# https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
-paxctl -cvm "$(command -v node)"
+# TODO Verify, if this is necessary or not.
+# # PaX-mark ruby
+# # Applying the mark late here does make the build usable on PaX kernels, but
+# # still the build itself must be executed on a non-PaX kernel. It's done here
+# # only for simplicity.
+# paxctl -cvm "$(command -v ruby)"
+# # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js
+# paxctl -cvm "$(command -v node)"
 
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub

From cde9b4e320849eb4f6f016c30a5eb973a86effef Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 22:28:17 +0200
Subject: [PATCH 1026/1124] Increase memory to avoid heap limit allocation
 failure

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 81b4201a1..6163e6120 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -215,7 +215,7 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 exec_as_git yarn install --production --pure-lockfile
 
 echo "Compiling assets. Please be patient, this could take a while..."
-exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096"
+exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=8192"
 
 # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml
 rm -rf ${GITLAB_DATA_DIR}/config/secrets.yml

From 3d07804194d6db3d4b04f878503bc053c202fd66 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 15 May 2025 23:29:09 +0200
Subject: [PATCH 1027/1124] Remove  symbolic link to the correct location of
 ca-cert file

- This hack was introduced by  #3027 in order to fix #3010.
---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d56fa8040..e8956ec88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,8 +84,6 @@ LABEL \
 
 EXPOSE 22/tcp 80/tcp 443/tcp
 
-RUN ln -s /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem
-
 VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"]
 WORKDIR ${GITLAB_INSTALL_DIR}
 ENTRYPOINT ["/sbin/entrypoint.sh"]

From 1192a2e210336aa491d4a6548f60f180c1329a8c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 16 May 2025 23:16:24 +0200
Subject: [PATCH 1028/1124] Reformat docker-compose files (fix incorrect
 indentation)

---
 contrib/docker-swarm/docker-compose.yml | 296 +++++++++++------------
 docker-compose.swarm.yml                | 286 +++++++++++------------
 docker-compose.yml                      | 262 ++++++++++-----------
 docs/docker-compose-keycloak.yml        | 298 ++++++++++++------------
 docs/docker-compose-registry.yml        | 108 ++++-----
 5 files changed, 625 insertions(+), 625 deletions(-)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 49df8e03c..21900a08e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -5,173 +5,173 @@ services:
     restart: always
     image: redis:6.2
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - /srv/docker/gitlab/redis:/var/lib/redis:Z
+      - /srv/docker/gitlab/redis:/var/lib/redis:Z
 
   postgresql:
     restart: always
     image: sameersbn/postgresql:14-20230628
     volumes:
-    - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
+      - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm
 
   gitlab:
     restart: always
     image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - /srv/docker/gitlab/gitlab:/home/git/data:Z
+      - /srv/docker/gitlab/gitlab:/home/git/data:Z
     configs:
       - gitlab-configs
     secrets:
       - gitlab-secrets
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=localhost
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-    - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH2_GENERIC_APP_ID=
-    - OAUTH2_GENERIC_APP_SECRET=
-    - OAUTH2_GENERIC_CLIENT_SITE=
-    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=
-    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=
-    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=
-    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=
-    - OAUTH2_GENERIC_ID_PATH=
-    - OAUTH2_GENERIC_USER_UID=
-    - OAUTH2_GENERIC_USER_NAME=
-    - OAUTH2_GENERIC_USER_EMAIL=
-    - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=
-    - OAUTH2_GENERIC_LABEL=
-    - OAUTH2_GENERIC_NAME=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=localhost
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+      - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH2_GENERIC_APP_ID=
+      - OAUTH2_GENERIC_APP_SECRET=
+      - OAUTH2_GENERIC_CLIENT_SITE=
+      - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=
+      - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=
+      - OAUTH2_GENERIC_CLIENT_TOKEN_URL=
+      - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=
+      - OAUTH2_GENERIC_ID_PATH=
+      - OAUTH2_GENERIC_USER_UID=
+      - OAUTH2_GENERIC_USER_NAME=
+      - OAUTH2_GENERIC_USER_EMAIL=
+      - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=
+      - OAUTH2_GENERIC_LABEL=
+      - OAUTH2_GENERIC_NAME=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
 
 configs:
   gitlab-configs:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 706339d2b..ce615cb21 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -3,9 +3,9 @@ services:
   redis:
     image: redis:6.2
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/var/lib/redis:Z
+      - redis-data:/var/lib/redis:Z
     deploy:
       placement:
         constraints:
@@ -14,12 +14,12 @@ services:
   postgresql:
     image: sameersbn/postgresql:14-20230628
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
     deploy:
       placement:
         constraints:
@@ -65,8 +65,8 @@ services:
   gitlab:
     image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
       # Listen on port 22, default for SSH and Git in host mode (only in its host)
       # So other nodes in the cluster can keep listening on port 22
@@ -74,8 +74,8 @@ services:
         published: 22
         mode: host
     volumes:
-    - gitlab-data:/home/git/data:Z
-    - certs-data:/certs
+      - gitlab-data:/home/git/data:Z
+      - certs-data:/certs
     # healthcheck:
     #   test: ["CMD", "/usr/local/sbin/healthcheck"]
     #   interval: 5m
@@ -88,138 +88,138 @@ services:
       # To be available for the public Traefik
       - traefik-public
     environment:
-    - DEBUG=false
-
-    - GITLAB_REGISTRY_ENABLED=true
-    - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
-    - GITLAB_REGISTRY_PORT=443
-    - GITLAB_REGISTRY_API_URL=http://registry:5000
-    - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
-    - GITLAB_REGISTRY_ISSUER=gitlab-issuer
-    - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
-
-    - GITLAB_SIGNUP_ENABLED=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=true
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=${GITLAB_HOST?Variable not set}
-    - GITLAB_PORT=443
-    - GITLAB_SSH_PORT=22
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
-
-    - RACK_ATTACK_ENABLED=false
+      - DEBUG=false
+
+      - GITLAB_REGISTRY_ENABLED=true
+      - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set}
+      - GITLAB_REGISTRY_PORT=443
+      - GITLAB_REGISTRY_API_URL=http://registry:5000
+      - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key
+      - GITLAB_REGISTRY_ISSUER=gitlab-issuer
+      - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true
+
+      - GITLAB_SIGNUP_ENABLED=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=true
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=${GITLAB_HOST?Variable not set}
+      - GITLAB_PORT=443
+      - GITLAB_SSH_PORT=22
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
+
+      - RACK_ATTACK_ENABLED=false
     deploy:
       placement:
         constraints:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e9e4a479..2eca3b67b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,32 +5,32 @@ services:
     restart: always
     image: redis:6.2
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/data:Z
+      - redis-data:/data:Z
 
   postgresql:
     restart: always
     image: sameersbn/postgresql:14-20230628
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
     image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - gitlab-data:/home/git/data:Z
+      - gitlab-data:/home/git/data:Z
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 5m
@@ -38,125 +38,125 @@ services:
       retries: 3
       start_period: 5m
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST=localhost
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=false
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
-    - OAUTH_ALLOW_SSO=
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=true
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST=localhost
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=false
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=
+      - OAUTH_ALLOW_SSO=
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=true
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
 
 volumes:
   redis-data:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b480118b7..eea284f86 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -5,176 +5,176 @@ services:
     restart: always
     image: redis:6.2
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis-data:/var/lib/redis:Z
+      - redis-data:/var/lib/redis:Z
 
   postgresql:
     restart: always
     image: sameersbn/postgresql:14-20230628
     volumes:
-    - postgresql-data:/var/lib/postgresql:Z
+      - postgresql-data:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
     image: sameersbn/gitlab:18.0.0
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "10080:80"
-    - "10022:22"
+      - "10080:80"
+      - "10022:22"
     volumes:
-    - gitlab-data:/home/git/data:Z
+      - gitlab-data:/home/git/data:Z
     environment:
-    - DEBUG=false
-
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
-
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
-
-    - GITLAB_HOST='<your-ip-address>'
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
-
-    - GITLAB_ROOT_PASSWORD=<root-password>
-    - GITLAB_ROOT_EMAIL=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-
-    - OAUTH_ENABLED=true
-    - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
-    - OAUTH_ALLOW_SSO=Keycloak
-    - OAUTH_BLOCK_AUTO_CREATED_USERS=false
-    - OAUTH_AUTO_LINK_LDAP_USER=false
-    - OAUTH_AUTO_LINK_SAML_USER=false
-    - OAUTH_EXTERNAL_PROVIDERS=Keycloak
-
-    - OAUTH_CAS3_LABEL=cas3
-    - OAUTH_CAS3_SERVER=
-    - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
-    - OAUTH_CAS3_LOGIN_URL=/cas/login
-    - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
-    - OAUTH_CAS3_LOGOUT_URL=/cas/logout
-
-    - OAUTH_GOOGLE_API_KEY=
-    - OAUTH_GOOGLE_APP_SECRET=
-    - OAUTH_GOOGLE_RESTRICT_DOMAIN=
-
-    - OAUTH_FACEBOOK_API_KEY=
-    - OAUTH_FACEBOOK_APP_SECRET=
-
-    - OAUTH_TWITTER_API_KEY=
-    - OAUTH_TWITTER_APP_SECRET=
-
-    - OAUTH_GITHUB_API_KEY=
-    - OAUTH_GITHUB_APP_SECRET=
-    - OAUTH_GITHUB_URL=
-    - OAUTH_GITHUB_VERIFY_SSL=
-
-    - OAUTH_GITLAB_API_KEY=
-    - OAUTH_GITLAB_APP_SECRET=
-
-    - OAUTH_BITBUCKET_API_KEY=
-    - OAUTH_BITBUCKET_APP_SECRET=
-    - OAUTH_BITBUCKET_URL=
-
-    - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
-    - OAUTH_SAML_IDP_CERT_FINGERPRINT=
-    - OAUTH_SAML_IDP_SSO_TARGET_URL=
-    - OAUTH_SAML_ISSUER=
-    - OAUTH_SAML_LABEL="Our SAML Provider"
-    - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-    - OAUTH_SAML_GROUPS_ATTRIBUTE=
-    - OAUTH_SAML_EXTERNAL_GROUPS=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
-    - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
-
-    - OAUTH_CROWD_SERVER_URL=
-    - OAUTH_CROWD_APP_NAME=
-    - OAUTH_CROWD_APP_PASSWORD=
-
-    - OAUTH_AUTH0_CLIENT_ID=
-    - OAUTH_AUTH0_CLIENT_SECRET=
-    - OAUTH_AUTH0_DOMAIN=
-    - OAUTH_AUTH0_SCOPE=
-
-    - OAUTH_AZURE_API_KEY=
-    - OAUTH_AZURE_API_SECRET=
-    - OAUTH_AZURE_TENANT_ID=
-
-    - OAUTH2_GENERIC_APP_ID=git
-    - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
-    - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
-    - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
-    - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
-    - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
-    - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
-    - OAUTH2_GENERIC_ID_PATH=sub
-    - OAUTH2_GENERIC_USER_UID=sub
-    - OAUTH2_GENERIC_USER_NAME=preferred_username
-    - OAUTH2_GENERIC_USER_EMAIL=email
-    - OAUTH2_GENERIC_NAME=Keycloak
+      - DEBUG=false
+
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
+
+      - GITLAB_HOST='<your-ip-address>'
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+
+      - GITLAB_ROOT_PASSWORD=<root-password>
+      - GITLAB_ROOT_EMAIL=
+
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+
+      - OAUTH_ENABLED=true
+      - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak
+      - OAUTH_ALLOW_SSO=Keycloak
+      - OAUTH_BLOCK_AUTO_CREATED_USERS=false
+      - OAUTH_AUTO_LINK_LDAP_USER=false
+      - OAUTH_AUTO_LINK_SAML_USER=false
+      - OAUTH_EXTERNAL_PROVIDERS=Keycloak
+
+      - OAUTH_CAS3_LABEL=cas3
+      - OAUTH_CAS3_SERVER=
+      - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false
+      - OAUTH_CAS3_LOGIN_URL=/cas/login
+      - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate
+      - OAUTH_CAS3_LOGOUT_URL=/cas/logout
+
+      - OAUTH_GOOGLE_API_KEY=
+      - OAUTH_GOOGLE_APP_SECRET=
+      - OAUTH_GOOGLE_RESTRICT_DOMAIN=
+
+      - OAUTH_FACEBOOK_API_KEY=
+      - OAUTH_FACEBOOK_APP_SECRET=
+
+      - OAUTH_TWITTER_API_KEY=
+      - OAUTH_TWITTER_APP_SECRET=
+
+      - OAUTH_GITHUB_API_KEY=
+      - OAUTH_GITHUB_APP_SECRET=
+      - OAUTH_GITHUB_URL=
+      - OAUTH_GITHUB_VERIFY_SSL=
+
+      - OAUTH_GITLAB_API_KEY=
+      - OAUTH_GITLAB_APP_SECRET=
+
+      - OAUTH_BITBUCKET_API_KEY=
+      - OAUTH_BITBUCKET_APP_SECRET=
+      - OAUTH_BITBUCKET_URL=
+
+      - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL=
+      - OAUTH_SAML_IDP_CERT_FINGERPRINT=
+      - OAUTH_SAML_IDP_SSO_TARGET_URL=
+      - OAUTH_SAML_ISSUER=
+      - OAUTH_SAML_LABEL="Our SAML Provider"
+      - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+      - OAUTH_SAML_GROUPS_ATTRIBUTE=
+      - OAUTH_SAML_EXTERNAL_GROUPS=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=
+      - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=
+
+      - OAUTH_CROWD_SERVER_URL=
+      - OAUTH_CROWD_APP_NAME=
+      - OAUTH_CROWD_APP_PASSWORD=
+
+      - OAUTH_AUTH0_CLIENT_ID=
+      - OAUTH_AUTH0_CLIENT_SECRET=
+      - OAUTH_AUTH0_DOMAIN=
+      - OAUTH_AUTH0_SCOPE=
+
+      - OAUTH_AZURE_API_KEY=
+      - OAUTH_AZURE_API_SECRET=
+      - OAUTH_AZURE_TENANT_ID=
+
+      - OAUTH2_GENERIC_APP_ID=git
+      - OAUTH2_GENERIC_APP_SECRET=<your-client-secret>
+      - OAUTH2_GENERIC_CLIENT_SITE=http://<your-ip-address>:10081
+      - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/userinfo
+      - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/auth
+      - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/token
+      - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
+      - OAUTH2_GENERIC_ID_PATH=sub
+      - OAUTH2_GENERIC_USER_UID=sub
+      - OAUTH2_GENERIC_USER_NAME=preferred_username
+      - OAUTH2_GENERIC_USER_EMAIL=email
+      - OAUTH2_GENERIC_NAME=Keycloak
 
   keycloak:
     restart: always
     image: jboss/keycloak:8.0.1
     ports:
-    - "10081:8080"
+      - "10081:8080"
     environment:
-    - DEBUG=false
-    - KEYCLOAK_PASSWORD=admin
-    - KEYCLOAK_USER=admin
+      - DEBUG=false
+      - KEYCLOAK_PASSWORD=admin
+      - KEYCLOAK_USER=admin
 
 volumes:
   redis-data:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f879181f5..49dbc1d56 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -5,89 +5,89 @@ services:
     restart: always
     image: redis:6.2
     command:
-    - --loglevel warning
+      - --loglevel warning
     volumes:
-    - redis:/var/lib/redis:Z
+      - redis:/var/lib/redis:Z
 
   postgresql:
     restart: always
     image: sameersbn/postgresql:14-20230628
     volumes:
-    - postgresql:/var/lib/postgresql:Z
+      - postgresql:/var/lib/postgresql:Z
     environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm,btree_gist
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm,btree_gist
 
   gitlab:
     restart: always
     image: sameersbn/gitlab:18.0.0
     volumes:
-    - gitlab-data:/home/git/data:Z
-    - gitlab-logs:/var/log/gitlab
-    - ./certs:/certs
+      - gitlab-data:/home/git/data:Z
+      - gitlab-logs:/var/log/gitlab
+      - ./certs:/certs
     depends_on:
-    - redis
-    - postgresql
+      - redis
+      - postgresql
     ports:
-    - "80:80"
-    - "10022:22"
+      - "80:80"
+      - "10022:22"
     external_links:
-    - "registry:registry.example.com"
+      - "registry:registry.example.com"
     environment:
-    - DEBUG=false
+      - DEBUG=false
 
-    - DB_ADAPTER=postgresql
-    - DB_HOST=postgresql
-    - DB_PORT=5432
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
+      - DB_ADAPTER=postgresql
+      - DB_HOST=postgresql
+      - DB_PORT=5432
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
 
-    - REDIS_HOST=redis
-    - REDIS_PORT=6379
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
 
-    - GITLAB_HTTPS=false
-    - SSL_SELF_SIGNED=false
+      - GITLAB_HTTPS=false
+      - SSL_SELF_SIGNED=false
 
-    - GITLAB_HOST=gitlab.example.com
-    - GITLAB_PORT=80
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-    - GITLAB_SECRETS_DB_KEY_BASE=secret
-    - GITLAB_SECRETS_SECRET_KEY_BASE=secret
-    - GITLAB_SECRETS_OTP_KEY_BASE=secret
-    - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret
+      - GITLAB_HOST=gitlab.example.com
+      - GITLAB_PORT=80
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+      - GITLAB_SECRETS_DB_KEY_BASE=secret
+      - GITLAB_SECRETS_SECRET_KEY_BASE=secret
+      - GITLAB_SECRETS_OTP_KEY_BASE=secret
+      - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret
 
-    - GITLAB_REGISTRY_ENABLED=true
-    - GITLAB_REGISTRY_HOST=registry.example.com
-    - GITLAB_REGISTRY_PORT=5000
-    - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000
-    - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt
-    - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key
+      - GITLAB_REGISTRY_ENABLED=true
+      - GITLAB_REGISTRY_HOST=registry.example.com
+      - GITLAB_REGISTRY_PORT=5000
+      - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000
+      - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt
+      - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key
 
   registry:
     restart: always
     image: registry:2.4.1
     ports:
-    - "5000:5000"
+      - "5000:5000"
     volumes:
-    - registry-data:/var/lib/registry
-    - ./certs:/certs
+      - registry-data:/var/lib/registry
+      - ./certs:/certs
     external_links:
-    - "gitlab:gitlab.example.com"
+      - "gitlab:gitlab.example.com"
     environment:
-    - REGISTRY_LOG_LEVEL=info
-    - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry
-    - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth
-    - REGISTRY_AUTH_TOKEN_SERVICE=container_registry
-    - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
-    - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt
-    - REGISTRY_STORAGE_DELETE_ENABLED=true
-    - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt
-    - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key
-    - REGISTRY_HTTP_SECRET=secret
+      - REGISTRY_LOG_LEVEL=info
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry
+      - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth
+      - REGISTRY_AUTH_TOKEN_SERVICE=container_registry
+      - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
+      - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt
+      - REGISTRY_STORAGE_DELETE_ENABLED=true
+      - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt
+      - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key
+      - REGISTRY_HTTP_SECRET=secret
 
 volumes:
     gitlab-data:

From 54df83058890b107e4fd046ee08cc2dd3a8eccaf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 09:02:10 +0200
Subject: [PATCH 1029/1124] Use docker image by kkimurak for postgresql

---
 README.md                               | 8 ++++----
 contrib/docker-swarm/docker-compose.yml | 2 +-
 docker-compose.swarm.yml                | 2 +-
 docker-compose.yml                      | 2 +-
 docs/docker-compose-keycloak.yml        | 2 +-
 docs/docker-compose-registry.yml        | 2 +-
 kubernetes/postgresql-rc.yml            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index efeff910d..50cfefba3 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm,btree_gist' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:14-20230628
+    kkimurak/sameersbn-postgresql:16
 ```
 
 Step 2. Launch a redis container
@@ -306,7 +306,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
 First, let's pull the postgresql image from the docker index.
 
 ```bash
-docker pull sameersbn/postgresql:14-20230628
+docker pull kkimurak/sameersbn-postgresql:16
 ```
 
 For data persistence lets create a store for the postgresql and start the container.
@@ -326,7 +326,7 @@ docker run --name gitlab-postgresql -d \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --env 'DB_EXTENSION=pg_trgm' \
     --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
-    sameersbn/postgresql:14-20230628
+    kkimurak/sameersbn-postgresql:16
 ```
 
 The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -2720,7 +2720,7 @@ Usage when using `docker-compose` can also be found there.
 >
 > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
 >
-> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
+> If you're using `sameersbn/postgresql` then please upgrade to `kkimurak/sameersbn-postgresql:16` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
 >
 > As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 21900a08e..8fb66cb35 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index ce615cb21..7f8c742d4 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -12,7 +12,7 @@ services:
           - node.labels.gitlab.redis-data == true
 
   postgresql:
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2eca3b67b..8864abbce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index eea284f86..12dea6780 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql-data:/var/lib/postgresql:Z
     environment:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 49dbc1d56..d8a5b876d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -11,7 +11,7 @@ services:
 
   postgresql:
     restart: always
-    image: sameersbn/postgresql:14-20230628
+    image: kkimurak/sameersbn-postgresql:16
     volumes:
       - postgresql:/var/lib/postgresql:Z
     environment:
diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml
index 9498d28b0..e6c4adbb3 100644
--- a/kubernetes/postgresql-rc.yml
+++ b/kubernetes/postgresql-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: sameersbn/postgresql:14-20230628
+        image: kkimurak/sameersbn-postgresql:16
         env:
         - name: DB_USER
           value: gitlab

From cf154bdf1fecfdb43769eaad256aa5c7eb336ff4 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 15:09:19 +0200
Subject: [PATCH 1030/1124] Ensure grants for user gitlab on schema public are
 correctly set

---
 assets/runtime/functions | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index b32048fb8..87e59a020 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -252,6 +252,11 @@ gitlab_uninstall_unused_database_client() {
   fi
 }
 
+gitlab_apply_dbms_fixes(){
+  echo "- Ensure grants for user gitlab on schema public are correctly set"
+  PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "GRANT ALL ON SCHEMA public TO gitlab;"
+}
+
 gitlab_configure_database() {
   echo -n "Configuring gitlab::database"
 
@@ -259,6 +264,7 @@ gitlab_configure_database() {
   gitlab_check_database_connection
   gitlab_generate_postgresqlrc
   gitlab_uninstall_unused_database_client
+  gitlab_apply_dbms_fixes
 
   update_template ${GITLAB_DATABASE_CONFIG} \
     DB_ENCODING \

From 1bf1c82deb15388043bde559fc36f66312b4a7c1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 18:36:58 +0200
Subject: [PATCH 1031/1124] Revert "Ensure grants for user gitlab on schema
 public are correctly set"

This reverts commit cf154bdf1fecfdb43769eaad256aa5c7eb336ff4.
---
 assets/runtime/functions | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 87e59a020..b32048fb8 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -252,11 +252,6 @@ gitlab_uninstall_unused_database_client() {
   fi
 }
 
-gitlab_apply_dbms_fixes(){
-  echo "- Ensure grants for user gitlab on schema public are correctly set"
-  PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "GRANT ALL ON SCHEMA public TO gitlab;"
-}
-
 gitlab_configure_database() {
   echo -n "Configuring gitlab::database"
 
@@ -264,7 +259,6 @@ gitlab_configure_database() {
   gitlab_check_database_connection
   gitlab_generate_postgresqlrc
   gitlab_uninstall_unused_database_client
-  gitlab_apply_dbms_fixes
 
   update_template ${GITLAB_DATABASE_CONFIG} \
     DB_ENCODING \

From d9566ce0ef12e43d566c709b8dce02efba31d49a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 18:47:21 +0200
Subject: [PATCH 1032/1124] Use redis:7 in docker compose files and kubernetes
 manifests

---
 Changelog.md                            |  1 +
 README.md                               |  6 +++---
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 docs/s3_compatible_storage.md           | 11 +++++------
 kubernetes/redis-rc.yml                 |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9a523e7f5..93a427c13 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab: upgrade CE to v18.0.0
 - gitaly: upgrade to v18.0.0
 - gitlab-pages: upgrade to v18.0.0
+- redis: upgrade to v7
 - rubygems: upgrade to v3.6.9
 - ubuntu: upgrade to noble-20250415.1
 
diff --git a/README.md b/README.md
index 50cfefba3..18a2e00a9 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ Step 2. Launch a redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 Step 3. Launch the gitlab container
@@ -387,7 +387,7 @@ To illustrate linking with a redis container, we will use the [redis](https://gi
 First, let's pull the redis image from the docker index.
 
 ```bash
-docker pull redis:6.2
+docker pull redis:7
 ```
 
 Lets start the redis container
@@ -395,7 +395,7 @@ Lets start the redis container
 ```bash
 docker run --name gitlab-redis -d \
     --volume /srv/docker/gitlab/redis:/data \
-    redis:6.2
+    redis:7
 ```
 
 We are now ready to start the GitLab application.
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8fb66cb35..ca6b49145 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 7f8c742d4..d33d1dbfc 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   redis:
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8864abbce..2ec91a1c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 12dea6780..e7e45e867 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d8a5b876d..2dbd1a3ff 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: redis:6.2
+    image: redis:7
     command:
       - --loglevel warning
     volumes:
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index ed815750e..35a15a0d5 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -6,13 +6,12 @@ This is an extend of AWS Remote Backups.
 
 As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
 
-
+- [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage)
 - [Available Parameters](#available-parameters)
 - [Installation](#installation)
-- [Maintenance](#maintenance)
-    - [Creating Backups](#creating-backups)
-    - [Restoring Backups](#restoring-backups)
-
+  - [Docker Compose](#docker-compose)
+  - [Creating Backups](#creating-backups)
+  - [Restoring Backups](#restoring-backups)
 
 # Available Parameters
 
@@ -72,7 +71,7 @@ version: '2'
 services:
   redis:
     restart: always
-    image: sameersbn/redis:6.2
+    image: sameersbn/redis:7
     command:
     - --loglevel warning
     volumes:
diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml
index b42b387b4..0c7991d65 100644
--- a/kubernetes/redis-rc.yml
+++ b/kubernetes/redis-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: redis:6.2
+        image: redis:7
         ports:
         - name: redis
           containerPort: 6379

From afee1ae8bd81657d08def74c82303c9b733d14df Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 18:52:05 +0200
Subject: [PATCH 1033/1124] Add link to guide to breaking changes to release
 notes.

---
 scripts/release-notes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh
index 676b86459..db67c17fd 100755
--- a/scripts/release-notes.sh
+++ b/scripts/release-notes.sh
@@ -42,10 +42,10 @@ Don't forget to consider the version specific upgrading instructions for [GitLab
 
 Please note:
 
+- Before upgrading to GitLab 18 make sure to read and understand the [notes about breaking changes](https://about.gitlab.com/blog/2025/04/18/a-guide-to-the-breaking-changes-in-gitlab-18-0/).
 - In GitLab 18.0 and later, [PostgreSQL 16 or later is required](https://docs.gitlab.com/install/installation/#software-requirements).
 - See issues to be aware of when upgrading: <https://docs.gitlab.com/update/>.
 
-
 ## Contributing
 
 You are kindly invited to provide contributions. If you find this image useful here's how you can help:

From 4ef5a3946b4c36519e9c8e904c9b40ab92694d00 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 20:16:56 +0200
Subject: [PATCH 1034/1124] Lint changelog.md

---
 Changelog.md | 533 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 528 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 93a427c13..b4891f8fc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -768,7 +768,6 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitaly: upgrade to v15.5.0
 - gitlab-shell: upgrade to v14.12.0
 
-
 **15.4.3**
 
 - gitlab: upgrade CE to v15.4.3
@@ -857,20 +856,24 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.59.0
 
 **15.0.3**
+
 - gitlab: upgrade CE to v15.0.3
 - gitaly: upgrade to v15.0.3
 
 **15.0.2**
+
 - gitlab: upgrade CE to v15.0.2
 - gitaly: upgrade to v15.0.2
 - ubuntu: upgrade to focal-20220531
 
 **15.0.1**
+
 - gitlab: upgrade CE to v15.0.1
 - gitaly: upgrade to v15.0.1
 - golang: upgrade to v1.17.11
 
 **15.0.0**
+
 - gitlab: upgrade CE to v15.0.0
 - gitaly: upgrade to v15.0.0
 - golang: upgrade to v1.17.10
@@ -878,26 +881,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.58.0
 
 **14.10.3**
+
 - gitlab: upgrade CE to v14.10.3
 - gitaly: upgrade to v14.10.3
 
 **14.10.2**
+
 - gitlab: upgrade CE to v14.10.2
 - gitaly: upgrade to v14.10.2
 - ubuntu: upgrade to focal-20220426
 
 **14.10.1**
+
 - gitlab: upgrade CE to v14.10.1
 - gitaly: upgrade to v14.10.1
 - ubuntu: upgrade to focal-20220426
 
 **14.10.0**
+
 - gitlab: upgrade CE to v14.10.0
 - gitaly: upgrade to v14.10.0
 - gitlab-shell: upgrade to v13.25.1
 - ubuntu: upgrade to focal-20220415
 
 **14.9.3**
+
 - gitlab: upgrade CE to v14.9.3
 - gitaly: upgrade to v14.9.3
 - golang: upgrade to v1.17.9
@@ -905,137 +913,165 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to focal-20220404
 
 **14.9.2**
+
 - gitlab: upgrade CE to v14.9.2
 - gitaly: upgrade to v14.9.2
 - gitlab-pages: upgrade to v1.56.1
 
 **14.9.1**
+
 - gitlab: upgrade CE to v14.9.1
 - gitaly: upgrade to v14.9.1
 
 **14.9.0**
+
 - gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.56.0
 - gitlab-shell: upgrade to v13.24.0
 
 **14.8.4**
+
 - gitlab: upgrade CE to v14.8.4
 - gitaly: upgrade to v14.8.4
 
 **14.8.3**
+
 - gitlab: upgrade CE to v14.8.3
 - gitaly: upgrade to v14.8.3
 - golang: upgrade to v1.17.8
 - ubuntu: upgrade to focal-20220316
 
 **14.8.2**
+
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
 
 **14.8.1**
+
 - gitlab: upgrade CE to v14.8.1
 - gitaly: upgrade to v14.8.1
 
 **14.8.0**
+
 - gitlab: upgrade CE to v14.8.0
 - gitaly: upgrade to v14.8.0
 - gitlab-pages: upgrade to v1.54.0
 - gitlab-shell: v13.23.2
 
 **14.7.3**
+
 - gitlab: upgrade CE to v14.7.3
 - gitaly: upgrade to v14.7.3
 - golang: upgrade to v1.17.7
 
 **14.7.2**
+
 - gitlab: upgrade CE to v14.7.2
 - gitaly: upgrade to v14.7.2
 - ubuntu: upgrade to focal-20220113
 
 **14.7.1**
+
 - gitlab: upgrade CE to v14.7.1
 - gitaly: upgrade to v14.7.1
 
 **14.7.0**
+
 - gitlab: upgrade CE to v14.7.0
 - gitaly: upgrade to v14.7.0
 - gitlab-shell: v13.22.2
 - gitlab-pages: upgrade to v1.51.0
 
 **14.6.3**
+
 - gitlab: upgrade CE to v14.6.3
 - gitaly: upgrade to v14.6.3
 
 **14.6.2**
+
 - gitlab: upgrade CE to v14.6.2
 - gitaly: upgrade to v14.6.2
 - golang: upgrade to v1.17.6
 - ubuntu: upgrade to focal-20220105
 
 **14.6.1**
+
 - gitlab: upgrade CE to v14.6.1
 - gitaly: upgrade to v14.6.1
 
 **14.6.0**
+
 - gitlab: upgrade CE to v14.6.0
 - gitaly: upgrade to v14.6.0
 - gitlab-pages: upgrade to v1.49.0
 
 **14.5.2**
+
 - gitlab: upgrade CE to v14.5.2
 - gitaly: upgrade to v14.5.2
 - golang: upgrade to v1.17.5
 
 **14.5.1**
+
 - gitlab: upgrade CE to v14.5.1
 - gitaly: upgrade to v14.5.1
 - gitlab-shell: v13.22.1
 
 **14.5.0**
+
 - gitlab: upgrade CE to v14.5.0
 - gitaly: upgrade to v14.5.0
 - gitlab-pages: upgrade to v1.48.0
 - gitlab-shell: v13.22.0
 
 **14.4.4**
+
 - gitlab: upgrade CE to v14.4.4
 - gitaly: upgrade to v14.4.4
 - ruby: upgrade to v2.7.5
 
 **14.4.3**
+
 - gitlab: upgrade CE to v14.4.3
 - gitaly: upgrade to v14.4.3
 - golang: upgrade to v1.17.4
 
 **14.4.2**
+
 - gitlab: upgrade CE to v14.4.2
 - gitaly: upgrade to v14.4.2
 - redis: upgrade to v6.2.6
 
 **14.4.1**
+
 - gitlab: upgrade CE to v14.4.1
 - gitaly: upgrade to v14.4.1
 
 **14.4.0**
+
 - gitlab: upgrade CE to v14.4.0
 - gitaly: upgrade to v14.4.0
 - gitlab-pages: upgrade to v1.46.0
 
 **14.3.3**
+
 - gitlab: upgrade CE to v14.3.3
 - gitaly: upgrade to v14.3.3
 
 **14.3.2**
+
 - gitlab: upgrade CE to v14.3.2
 - gitaly: upgrade to v14.3.2
 - gitlab-shell: v13.21.1
 
 **14.3.1**
+
 - gitlab: upgrade CE to v14.3.1
 - gitaly: upgrade to v14.3.1
 
 **14.3.0**
+
 - gitlab: upgrade CE to v14.3.0
 - gitaly: upgrade to v14.3.0
 - gitlab-shell: v13.21.0
@@ -1044,182 +1080,218 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to focal-20211006
 
 **14.2.5**
+
 - gitlab: upgrade CE to v14.2.5
 - gitaly: upgrade to v14.2.5
 
 **14.2.4**
+
 - gitlab: upgrade CE to v14.2.4
 - gitaly: upgrade to v14.2.4
 - golang: upgrade to v1.17.1
 
 **14.2.3**
+
 - gitlab: upgrade CE to v14.2.3
 - gitaly: upgrade to v14.2.3
 
 **14.2.2**
+
 - gitlab: upgrade CE to v14.2.2
 - gitaly: upgrade to v14.2.2
 - ubuntu: upgrade to focal-20210827
 
 **14.2.1**
+
 - gitlab: upgrade CE to v14.2.1
 - gitaly: upgrade to v14.2.1
 
 **14.2.0**
+
 - gitlab: upgrade CE to v14.2.0
 - gitaly: upgrade to v14.2.0
 - gitlab-pages: upgrade to v1.42.0
 - golang: upgrade to v1.17
 
 **14.1.3**
+
 - gitlab: upgrade CE to v14.1.3
 - gitaly: upgrade to v14.1.3
 - golang: upgrade to v1.16.7
 
 **14.1.2**
+
 - gitlab: upgrade CE to v14.1.2
 - gitaly: upgrade to v14.1.2
 - gitlab-shell: upgrade to v13.19.1
 
 **14.1.1**
+
 - gitlab: upgrade CE to v14.1.1
 - gitaly: upgrade to v14.1.1
 - ubuntu: upgrade to focal-20210723
 
 **14.1.0**
+
 - gitlab: upgrade CE to v14.1.0
 - gitaly: upgrade to v14.1.0
 
 **14.0.6**
+
 - gitlab: upgrade CE to v14.0.6
 - gitaly: upgrade to v14.0.6
 - golang: upgrade to v1.16.6
 
 **14.0.5**
+
 - gitlab: upgrade CE to v14.0.5
 - gitaly: upgrade to v14.0.5
 
 **14.0.4**
+
 - gitlab: upgrade CE to v14.0.4
 - gitaly: upgrade to v14.0.4
 
 **14.0.3**
+
 - gitlab: upgrade CE to v14.0.3
 - gitaly: upgrade to v14.0.3
 
 **14.0.2**
+
 - gitlab: upgrade CE to v14.0.2
 - gitaly: upgrade to v14.0.2
 
 **14.0.1**
+
 - gitlab: upgrade CE to v14.0.1
 - gitaly: upgrade to v14.0.1
 
 **14.0.0**
+
 - gitlab: upgrade CE to v14.0.0
 - gitaly: upgrade to v14.0.0
 - gitlab-shell: upgrade to v13.19.0
 - gitlab-pages: upgrade to v1.40.0
 
 **13.12.5**
+
 - gitlab: upgrade CE to v13.12.5
 - gitaly: upgrade to v13.12.5
 - ubuntu: upgrade to focal-20210609
 
 **13.12.4**
+
 - gitlab: upgrade CE to v13.12.4
 - gitaly: upgrade to v13.12.4
 
 **13.12.3**
+
 - gitlab: upgrade CE to v13.12.3
 - gitaly: upgrade to v13.12.3
 - golang: upgrade to v1.16.5
 
 **13.12.2**
+
 - gitlab: upgrade CE to v13.12.2
 - gitaly: upgrade to v13.12.2
 
 **13.12.1**
+
 - gitlab: upgrade CE to v13.12.1
 - gitaly: upgrade to v13.12.1
 
 **13.12.0**
+
 - gitlab: upgrade CE to v13.12.0
 - gitlab-shell: upgrade to v13.18.0
 - gitlab-pages: upgrade to v1.39.0
 - gitaly: upgrade to v13.12.0
 
 **13.11.4**
+
 - gitlab: upgrade CE to v13.11.4
 - gitaly: upgrade to v13.11.4
 - golang: upgrade to v1.16.4
 - ubuntu: upgrade to focal-20210416
 
 **13.11.3**
+
 - gitlab: upgrade CE to v13.11.3
 - gitaly: upgrade to v13.11.3
 
 **13.11.2**
+
 - gitlab: upgrade CE to v13.11.2
 - gitaly: upgrade to v13.11.2
 
 **13.11.1**
+
 - gitlab: upgrade CE to v13.11.1
 - gitaly: upgrade to v13.11.1
 
 **13.11.0**
+
 - gitlab: upgrade CE to v13.11.0
 - gitaly: upgrade to v13.11.0
 - gitlab-pages: upgrade to v1.38.0
 - ubuntu: upgrade to focal-20210401
 
 **13.10.3**
+
 - gitlab: upgrade CE to v13.10.3
 - gitaly: upgrade to v13.10.3
 
 **13.10.2**
+
 - gitlab: upgrade CE to v13.10.2
 - gitaly: upgrade to v13.10.2
 - golang: upgrade to v1.16.3
 - ubuntu: upgrade to bionic-20210325
 
 **13.10.1**
+
 - gitlab: upgrade CE to v13.10.1
 - gitaly: upgrade to v13.10.1
 - added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma)
 
 **13.10.0**
+
 - gitlab: upgrade CE to v13.10.0
 - gitaly: upgrade to v13.10.0
 - gitlab-pages: upgrade to v1.36.0
 
 **13.9.5**
+
 - gitlab: upgrade CE to v13.9.5
 - gitaly: upgrade to v13.9.5
 
 **13.9.4**
+
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
 - golang: upgrade to v1.16.2
 - ubuntu: upgrade to bionic-20210222
 
 **13.9.3**
+
 - gitlab: upgrade CE to v13.9.3
 - gitaly: upgrade to v13.9.3
 - gitlab-shell: upgrade to v13.17.0
 
 **13.9.2**
+
 - gitlab: upgrade CE to v13.9.2
 - gitaly: upgrade to v13.9.2
 - gitlab-workhorse: upgrade to v8.63.2
 
-
 **13.9.1**
+
 - gitlab: upgrade CE to v13.9.1
 - gitaly: upgrade to v13.9.1
 
-
 **13.9.0**
+
 - gitlab: upgrade CE to v13.9.0
 - gitaly: upgrade to v13.9.0
 - gitlab-shell: upgrade to v13.16.1
@@ -1228,6 +1300,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.16
 
 **13.8.4**
+
 - added `SSL_PROTOCOLS` option to change protocols of the nginx
 - added `SSL_REGISTRY_CIPHERS`
 - added `SSL_REGISTRY_PROTOCOLS`
@@ -1238,19 +1311,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v13.15.1
 
 **13.8.3**
+
 - gitlab: upgrade CE to v13.8.3
 - gitaly: upgrade to v13.8.3
 - golang: upgrade to v1.15.8
 
 **13.8.2**
+
 - gitlab: upgrade CE to v13.8.2
 - gitaly: upgrade to v13.8.2
 
 **13.8.1**
+
 - gitlab: upgrade CE to v13.8.1
 - gitaly: upgrade to v13.8.1
 
 **13.8.0**
+
 - gitlab: upgrade CE to v13.8.0
 - gitaly: upgrade to v13.8.0
 - gitlab-shell: upgrade to v13.15.0
@@ -1260,19 +1337,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to bionic-20210118
 
 **13.7.4**
+
 - gitlab: upgrade CE to v13.7.4
 
 **13.7.3**
+
 - gitlab: upgrade CE to v13.7.3
 - gitlab-pages: upgrade to v1.34.0
 - gitlab-shell: upgrade to v13.7.3
 - gitlab-workhorse: upgrade to v8.58.2
 
 **13.7.1**
+
 - gitlab: upgrade CE to v13.7.1
 - gitaly: upgrade v13.7.1
 
 **13.7.0**
+
 - gitlab: upgrade CE to v13.7.0
 - gitaly: upgrade v13.7.0
 - gitlab-shell: upgrade to v13.14.0
@@ -1282,18 +1363,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - postgresql: upgrade to postgresql 12
 
 **13.6.3**
+
 - gitlab: upgrade CE to v13.6.3
 - gitaly: upgrade v13.6.3
 
 **13.6.2**
+
 - gitlab: upgrade CE to v13.6.2
 - gitaly: upgrade v13.6.2
 
 **13.6.1**
+
 - gitlab: upgrade CE to v13.6.1
 - gitaly: upgrade v13.6.1
 
 **13.6.0**
+
 - gitlab: upgrade CE to v13.6.0
 - gitaly: upgrade v13.6.0
 - gitlab-shell: upgrade to v13.13.0
@@ -1303,18 +1388,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - use ruby 2.7
 
 **13.5.4**
+
 - gitlab: upgrade CE to v13.5.4
 - gitaly: upgrade v13.5.4
 
 **13.5.3**
+
 - gitlab: upgrade CE to v13.5.3
 - gitaly: upgrade v13.5.3
 
 **13.5.2**
+
 - gitlab: upgrade CE to v13.5.2
 - gitaly: upgrade v13.5.2
 
 **13.5.1**
+
 - gitlab: upgrade CE to v13.5.1
 - gitaly: upgrade v13.5.1
 - gitlab-shell: upgrade to v13.11.0
@@ -1322,14 +1411,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-workhorse: upgrade to v8.51.0
 
 **13.4.4**
+
 - gitlab: upgrade CE to v13.4.4
 - gitaly: upgrade to v13.4.4
 
 **13.4.3**
+
 - gitlab: upgrade CE to v13.4.3
 - gitaly: upgrade to v13.4.3
 
 **13.4.2**
+
 - gitlab: upgrade CE to v13.4.2
 - gitaly: upgrade to v13.4.2
 - gitlab-pages: upgrade to 1.25.0
@@ -1338,14 +1430,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to bionic-20200921
 
 **13.3.4**
+
 - gitlab: upgrade CE to v13.3.4
 - gitaly: upgrade to v13.3.4
 
 **13.3.1**
+
 - gitlab: upgrade CE to v13.3.1
 - gitaly: upgrade to v13.3.1
 
 **13.3.0**
+
 - gitlab: upgrade CE to v13.3.0
 - gitaly: upgrade to v13.3.0
 - gitlab-pages: upgrade to v1.22.0
@@ -1353,71 +1448,90 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-workhorse: upgrade to v8.39.0
 
 **13.2.6**
+
 - gitlab: upgrade CE to v13.2.6
 
 **13.2.4**
+
 - gitlab: upgrade CE to v13.2.4
 - ubuntu: upgrade to bionic-20200713
 
 **13.2.3**
+
 - gitlab: upgrade CE to v13.2.3
 - golang: upgrade to 1.14.7
 - gitaly: upgrade to 13.2.3
 - postgresql: add btree_gist extension
 
 **13.2.2**
+
 - gitlab: upgrade CE to v13.2.2
 
 **13.2.1**
+
 - gitlab: upgrade CE to v13.2.1
 
 **13.0.7**
+
 - gitlab: upgrade CE to v13.0.7
 
 **13.0.6**
+
 - gitlab: upgrade CE to v13.0.6
 
 **13.0.5**
+
 - gitlab: upgrade CE to v13.0.5
 
 **13.0.3**
+
 - gitlab: upgrade CE to v13.0.3
 
 **13.0.2**
+
 - gitlab: upgrade CE to v13.0.2
 
 **13.0.1**
+
 - gitlab: upgrade CE to v13.0.1
 
 **13.0.0**
+
 - gitlab: upgrade CE to v13.0.0
 
 **12.10.6**
+
 - gitlab: upgrade CE to v12.10.6
 
 **12.10.4**
+
 - updated to ubuntu:bionic-20200403
 - gitlab-workhorse: update to 8.30.1
 - sync: upstream configs
 - gitlab: upgrade to 12.10.4
 
 **12.9.5**
+
 - gitlab: updated to 12.9.5
 - gitlab-shell: updated to 12.2.0
 - gitaly: updated to 12.10.0
 
 **12.9.4**
+
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
 
 **12.9.2**
+
 - gitlab: upgrade CE to v12.9.2
 
 **12.9.1**
+
 - gitlab: upgrade CE to v12.9.1
 
 **12.9.0**
+
 - gitlab: upgrade CE to v12.9.0
 - replaced unicorn with puma
 - Removed `UNICORN_WORKERS`
@@ -1428,50 +1542,65 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `PUMA_TIMEOUT`
 
 **12.8.8**
+
 - gitlab: upgrade CE to v12.8.8
 
 **12.8.7**
+
 - gitlab: upgrade CE to v12.8.7
 
 **12.8.6**
+
 - gitlab: upgrade CE to v12.8.6
 
 **12.8.5**
+
 - gitlab: upgrade CE to v12.8.5
 
 **12.8.4**
+
 - gitlab: upgrade CE to v12.8.4
 
 **12.8.3**
+
 - gitlab: upgrade CE to v12.8.3
 
 **12.8.2**
+
 - gitlab: upgrade CE to v12.8.2
 
 **12.8.1**
+
 - gitlab: upgrade CE to v12.8.1
 
 **12.8.0**
+
 - gitlab: upgrade CE to v12.8.0
 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
 
 **12.7.8**
+
 - Upgrade GitLab CE to 12.7.8
 
 **12.7.7**
+
 - Upgrade GitLab CE to 12.7.7
 - Add Generic OAuth Provider PR#2070
 
 **12.7.7**
+
 - Upgrade GitLab CE to 12.7.7
 
 **12.7.6**
+
 - gitlab: upgrade CE to v12.7.6
 
 **12.7.5**
+
 - gitlab: upgrade CE to v12.7.5
 
 **12.7.4**
+
 - Upgrade GitLab CE to 12.7.4
 - Update golang to 1.13.7
 - Update gitlab-pages to 1.15.0
@@ -1479,9 +1608,11 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Update gitaly to 1.85.0
 
 **12.7.2**
+
 - Upgrade GitLab CE to 12.7.2
 
 **12.7.0**
+
 - Update gitlab-shell to 11.0.0
 - Upgrade GitLab CE to 12.7.0
 - Update golang to 1.13.6
@@ -1490,123 +1621,162 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Update gitlab-workhorse to 8.19.0
 
 **12.6.4**
+
 - gitlab: upgrade CE to v12.6.4
 
 **12.6.3**
+
 - gitlab: upgrade CE to v12.6.3
 
 **12.6.2**
+
 - gitlab: upgrade CE to v12.6.2
 
 **12.6.1**
+
 - gitlab: upgrade CE to v12.6.1
 
 **12.6.0**
+
 - gitlab: upgrade CE to v12.6.0
 
 **12.5.7**
+
 - gitlab: upgrade CE to v12.5.7
 
 **12.5.6**
+
 - gitlab: upgrade CE to v12.5.6
 
 **12.5.5**
+
 - gitlab: upgrade CE to v12.5.5
 
 **12.5.4**
+
 - gitlab: upgrade CE to v12.5.4
 - Update golang to 1.12.14
 
 **12.5.3**
+
 - gitlab: upgrade CE to v12.5.3
 
 **12.5.2**
+
 - gitlab: upgrade CE to v12.5.2
 
 **12.5.1**
+
 - gitlab: upgrade CE to v12.5.1
 
 **12.5.0**
+
 - gitlab: upgrade CE to v12.5.0
 
 **12.4.3**
+
 - gitlab: upgrade CE to v12.4.3
 
 **12.4.2**
+
 - gitlab: upgrade CE to v12.4.2
 
 **12.4.1**
+
 - gitlab: upgrade CE to v12.4.1
 
 **12.4.0**
+
 - gitlab: upgrade CE to v12.4.0
 
 **12.3.5**
+
 - gitlab: upgrade CE to v12.3.5
 
 **12.3.4**
+
 - gitlab: upgrade CE to v12.3.4
 
 **12.3.3**
+
 - gitlab: upgrade CE to v12.3.3
 
 **12.3.2**
+
 - gitlab: upgrade CE to v12.3.2
 
 **12.3.1**
+
 - gitlab: upgrade CE to v12.3.1
 
 **12.3.0**
+
 - gitlab: upgrade CE to v12.3.0
 
 **12.2.5**
+
 - gitlab: upgrade CE to v12.2.5
 
 **12.2.4**
+
 - gitlab: upgrade CE to v12.2.4
 
 **12.2.3**
+
 - gitlab: upgrade CE to v12.2.3
 
 **12.2.1**
+
 - gitlab: upgrade CE to v12.2.1
 
 **12.2.0**
+
 - gitlab: upgrade CE to v12.2.0
 - upgrade base image to ubuntu:bionic
 
 **12.1.6**
+
 - gitlab: upgrade CE to v12.1.6
 
 **12.1.4**
+
 - gitlab: upgrade CE to v12.1.4
 
 **12.1.3**
+
 - gitlab: upgrade CE to v12.1.3
 
 **12.1.2**
+
 - gitlab: upgrade CE to v12.1.2
 
 **12.1.1**
+
 - gitlab: upgrade CE to v12.1.1
 
 **12.1.0**
+
 - gitlab: upgrade CE to v12.1.0
 - Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html)
 
 **12.0.4**
+
 - gitlab: upgrade CE to v12.0.4
 
 **12.0.3**
+
 - gitlab: upgrade CE to v12.0.3
 
 **12.0.2**
+
 - gitlab: upgrade CE to v12.0.2
 
 **12.0.1**
+
 - gitlab: upgrade CE to v12.0.1
 
 **12.0.0**
+
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
 - Update gitlab-shell to 9.3.0
@@ -1615,105 +1785,134 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - python: update to 3
 
 **11.11.3**
+
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
 - Update golang to 1.12.6
 
 **11.11.2**
+
 - gitlab: upgrade CE to v11.11.2
 - Update gitaly to 1.42.3
 
 **11.11.1**
+
 - gitlab: upgrade CE to v11.11.1
 - Update gitaly to 1.42.2
 
 **11.11.0**
+
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
 - Update gitlab-shell to 9.1.0
 - Update gitlab-workhorse to 8.7.0
 
 **11.10.4**
+
 - gitlab: upgrade CE to v11.10.4
 
 **11.10.3**
+
 - gitlab: upgrade CE to v11.10.3
 
 **11.10.2**
+
 - gitlab: upgrade CE to v11.10.2
 
 **11.10.1**
+
 - gitlab: upgrade CE to v11.10.1
 
 **11.10.0**
+
 - gitlab: upgrade CE to v11.10.0
 
 **11.9.8**
+
 - gitlab: upgrade CE to v11.9.8
 
 **11.9.7**
+
 - gitlab: upgrade CE to v11.9.7
 
 **11.9.6**
+
 - gitlab: upgrade CE to v11.9.6
 
 **11.9.5**
+
 - gitlab: upgrade CE to v11.9.5
 
 **11.9.4**
+
 - gitlab: upgrade CE to v11.9.4
 - Update gitlab-workhorse to 8.3.3
 
 **11.9.1**
+
 - gitlab: upgrade CE to v11.9.1
 - Update gitaly to 1.27.1
 
 **11.9.0**
+
 - gitlab: upgrade CE to v11.9.0
 
 **11.8.3**
+
 - gitlab: upgrade CE to v11.8.3
 
 **11.8.2**
+
 - gitlab: upgrade CE to v11.8.2
 
 **11.8.1**
+
 - gitlab: upgrade CE to v11.8.1
 
 **11.8.0**
+
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
 - Update gitaly to 1.20.0
 - Update gitlab-pages to 1.5.0
 
 **11.7.5**
+
 - gitlab: upgrade CE to v11.7.5
 
 **11.7.4**
+
 - gitlab: upgrade CE to v11.7.4
 
 **11.7.3**
+
 - gitlab: upgrade CE to v11.7.3
 - Update gitlab-workhorse to 8.1.1
 - Update gitaly to 1.13.0
 - Update gitlab-pages to 1.4.0
 
 **11.7.0**
+
 - gitlab: upgrade CE to v11.7.0
 
 **11.6.5**
+
 - gitlab: upgrade CE to v11.6.5
 
 **11.6.4**
+
 - gitlab: upgrade CE to v11.6.4
 
 **11.6.3**
+
 - gitlab: upgrade CE to v11.6.3
 
 **11.6.2**
+
 - gitlab: upgrade CE to v11.6.2
 
 **11.6.1**
+
 - gitlab: upgrade CE to v11.6.1
 - Added `GITLAB_IMPERSONATION_ENABLED`
 - Added `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME`
@@ -1724,6 +1923,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
 **11.6.0**
+
 - gitlab: upgrade CE to v11.6.0
 - Update gitaly to 1.7.1
 - Update gitlab-shell to 8.4.3
@@ -1739,157 +1939,203 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_PAGES_NGINX_PROXY`
 
 **11.5.5**
+
 - gitlab: upgrade CE to v11.5.5
 
 **11.5.4**
+
 - gitlab: upgrade CE to v11.5.4
 
 **11.5.3**
+
 - gitlab: upgrade CE to v11.5.3
 
 **11.5.2**
+
 - gitlab: upgrade CE to v11.5.2
 
 **11.5.1-1**
+
 - Fixed GitLab Dependencies
 
 **11.5.1**
+
 - gitlab: upgrade CE to v11.5.1
 
 **11.5.0**
+
 - gitlab: upgrade CE to v11.5.0
 
 **11.4.7**
+
 - gitlab: upgrade CE to v11.4.7
 
 **11.4.6**
+
 - gitlab: upgrade CE to v11.4.6
 
 **11.4.5**
+
 - gitlab: upgrade CE to v11.4.5
 
 **11.4.4**
+
 - gitlab: upgrade CE to v11.4.4
 - golang: update to 1.10.4
 
 **11.4.3**
+
 - gitlab: upgrade CE to v11.4.3
 
 **11.4.2**
+
 - gitlab: upgrade CE to v11.4.2
 
 **11.4.1**
+
 - gitlab: upgrade CE to v11.4.1
 - Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731)
 
 **11.4.0**
+
 - gitlab: upgrade CE to v11.4.0
 - baseimage: upgrade to xenial-20181005
 
 **11.3.6**
+
 - gitlab: upgrade CE to v11.3.6
 
 **11.3.5**
+
 - gitlab: upgrade CE to v11.3.5
 
 **11.3.4**
+
 - gitlab: upgrade CE to v11.3.4
 
 **11.3.3**
+
 - gitlab: upgrade CE to v11.3.3
 
 **11.3.2**
+
 - gitlab: upgrade CE to v11.3.2
 
 **11.3.1**
+
 - gitlab: upgrade CE to v11.3.1
 
 **11.3.0**
+
 - gitlab: upgrade CE to v11.3.0
 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
 - Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699)
 - Fix gitlay-ssh symlink to enable rebase/squash in forks
 
 **11.2.3**
+
 - gitlab: upgrade CE to v11.2.3
 
 **11.2.2**
+
 - gitlab: upgrade CE to v11.2.2
 
 **11.2.1**
+
 - gitlab: upgrade CE to v11.2.1
 
 **11.2.0**
+
 - gitlab: upgrade CE to v11.2.0
 - ADD `GITLAB_DEFAULT_THEME`
 
 **11.1.4**
+
 - gitlab: upgrade CE to v11.1.4
 
 **11.1.3**
+
 - gitlab: upgrade CE to v11.1.3
 - Upgrade redis to 4.0.9-1
 
 **11.1.2**
+
 - gitlab: upgrade CE to v11.1.2
 
 **11.1.1**
+
 - gitlab: upgrade CE to v11.1.1
 
 **11.1.0**
+
 - gitlab: upgrade CE to v11.1.0
 
 **11.0.4**
+
 - gitlab: upgrade CE to v11.0.4
 
 **11.0.3**
+
 - gitlab: upgrade CE to v11.0.3
 - ruby: update to 2.4
 
 **11.0.2**
+
 - gitlab: upgrade CE to v11.0.2
 
 **11.0.1**
+
 - gitlab: upgrade CE to v11.0.1
 
 **11.0.0**
+
 - gitlab: upgrade CE to v11.0.0
 
 **10.8.4**
+
 - gitlab: upgrade CE to v10.8.4
 
 **10.8.3-1**
-- Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628)
 
+- Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628)
 
 **10.8.3**
+
 - gitlab: upgrade CE to v10.8.3
 - Fix potential boot problems on clean setups [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621)
 
 **10.8.2**
+
 - gitlab: upgrade CE to v10.8.2
 
 **10.8.1**
+
 - gitlab: upgrade CE to v10.8.1
 
 **10.8.0**
+
 - gitlab: upgrade CE to v10.8.0
 - Add support for swarm mode with docker-configs and docker secrets ([#1540](https://github.com/sameersbn/docker-gitlab/pull/1540))
 
 **10.7.4**
+
 - gitlab: upgrade CE to v10.7.4
 - FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
 **10.7.3**
+
 - gitlab: upgrade CE to v10.7.3
 
 **10.7.2**
+
 - gitlab: upgrade CE to v10.7.2
 
 **10.7.1**
+
 - gitlab: upgrade CE to v10.7.1
 
 **10.7.0**
+
 - gitlab: upgrade CE to v10.7.0
 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT`
 - ADD `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED`
@@ -1931,76 +2177,98 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
 **10.6.4**
+
 - gitlab: upgrade CE to v10.6.4
 
 **10.6.3**
+
 - gitlab: upgrade CE to v10.6.3
 
 **10.6.2**
+
 - gitlab: upgrade CE to v10.6.2
 - golang: update to 1.9.5
 
 **10.6.1**
+
 - gitlab: upgrade CE to v10.6.1
 
 **10.6.0**
+
 - gitlab: upgrade CE to v10.6.0
 
 **10.5.6**
+
 - gitlab: security upgrade CE to v10.5.6
 
 **10.5.5**
+
 - gitlab: upgrade CE to v10.5.5
 
 **10.5.4**
+
 - gitlab: upgrade CE to v10.5.4
 
 **10.5.3**
+
 - gitlab: upgrade CE to v10.5.3
 
 **10.5.2**
+
 - gitlab: upgrade CE to v10.5.2
 - Fix `GITLAB_UPLOADS_STORAGE_PATH`
 
 **10.5.1**
+
 - gitlab: upgrade CE to v10.5.1
 
 **10.5.0**
+
 - gitlab: upgrade CE to v10.5.0
 - Add `GITLAB_UPLOADS_STORAGE_PATH`
 - Add `GITLAB_UPLOADS_BASE_DIR`
 - Add `LDAP_LOWERCASE_USERNAMES`
 
 **10.4.4**
+
 - gitlab: upgrade CE to v10.4.4
 
 **10.4.3**
+
 - gitlab: upgrade CE to v10.4.3
 
 **10.4.2-1**
+
 - FIXED SSH Host Key generation through dropping the support for rsa1
 
 **10.4.2**
+
 - gitlab: upgrade CE to v10.4.2
 
 **10.4.1**
+
 - gitlab: upgrade CE to v10.4.1
 
 **10.4.0**
+
 - gitlab: upgrade CE to v10.4.0
 - docker: upgrade to ubuntu xenial as baseimage
 - golang: update to 1.9.3
 
 **10.3.6**
+
 - gitlab: upgrade CE to v10.3.6
 
 **10.3.5**
+
 - gitlab: upgrade CE to v10.3.5
 
 **10.3.4**
+
 - gitlab: upgrade CE to v10.3.4
 
 **10.3.3**
+
 - gitlab: upgrade CE to v10.3.3
 - ADDED `AWS_BACKUP_ENCRYPTION` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
 - ADDED `AWS_BACKUP_STORAGE_CLASS` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
@@ -2008,12 +2276,15 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Apply PaX mark to ruby [1458](https://github.com/sameersbn/docker-gitlab/pull/1458)
 
 **10.3.2**
+
 - gitlab: upgrade CE to v10.3.2
 
 **10.3.1**
+
 - gitlab: upgrade CE to v10.3.1
 
 **10.3.0**
+
 - gitlab: upgrade CE to v10.3.0
 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD`
 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME`
@@ -2023,129 +2294,169 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - REMOVED `GITLAB_TIMEOUT`
 
 **10.2.5**
+
 - gitlab: upgrade CE to v10.2.5
 
 **10.2.4**
+
 - gitlab: upgrade to CE v10.2.4
 
 **10.2.3**
+
 - gitlab: upgrade to CE v10.2.3
 
 **10.2.2**
+
 - gitlab: upgrade to CE v10.2.2
 
 **10.2.1**
+
 - gitlab: upgrade to CE v10.2.1
 
 **10.2.0**
+
 - gitlab: upgrade to CE v10.2.0
 
 **10.1.4**
+
 - gitlab: upgrade to CE v10.1.4
 
 **10.1.3**
+
 - gitlab: upgrade to CE v10.1.3
 
 **10.1.2**
+
 - gitlab: upgrade to CE v10.1.2
 
 **10.1.1**
+
 - gitlab: upgrade to CE v10.1.1
 
 **10.1.0**
+
 - gitlab: upgrade to CE v10.1.0
 - REMOVED `GITALY_ENABLED``
 - ADDED `GITALY_ARTIFACTS_SERVER`
 - ADDED `GITALY_CLIENT_PATH`
 
 **10.0.4**
+
 - gitlab: upgrade to CE v10.0.4
 
 **10.0.3**
+
 - gitlab: upgrade to CE v10.0.3
 
 **10.0.2**
+
 - gitlab: upgrade to CE v10.0.2
 
 **10.0.1**
+
 - gitlab: upgrade to CE v10.0.1
 
 **10.0.0**
+
 - gitlab: upgrade to CE v10.0.0
 
 **9.5.5**
+
 - gitlab: upgrade to CE v9.5.5
 
 **9.5.4**
+
 - gitlab: upgrade to CE v9.5.4
 
 **9.5.3**
+
 - gitlab: upgrade to CE v9.5.3
 
 **9.5.2**
+
 - gitlab: upgrade to CE v9.5.2
 
 **9.5.1**
+
 - gitlab: upgrade to CE v9.5.1
 
 **9.5.0**
+
 - gitlab: upgrade to CE v9.5.0
 
 **9.4.5**
+
 - gitlab: upgrade to CE v9.4.5
 
 **9.4.4**
+
 - gitlab: upgrade to CE v9.4.4
 
 **9.4.3**
+
 - gitlab: upgrade to CE v9.4.3
 
 **9.4.2**
+
 - gitlab: upgrade to CE v9.4.2
 
 **9.4.1**
+
 - gitlab: upgrade to CE v9.4.1
 
 **9.4.0-1**
+
 - Fix asset compiling for missing translations
 
 **9.4.0**
+
 - gitlab: upgrade to CE v9.4.0
 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137))
 - Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
 
 **9.3.9**
+
 - gitlab: upgrade to CE v9.3.9
 
 **9.3.8**
+
 - gitlab: upgrade to CE v9.3.8
 - Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
 
 **9.3.7**
+
 - gitlab: upgrade to CE v9.3.7
 
 **9.3.6**
+
 - gitlab: upgrade to CE v9.3.6
 
 **9.3.5**
+
 - gitlab: upgrade to CE v9.3.5
 
 **9.3.4**
+
 - gitlab: upgrade to CE v9.3.4
 
 **9.3.3**
+
 - gitlab: upgrade to CE v9.3.3
 
 **9.3.2**
+
 - gitlab: upgrade to CE v9.3.2
 
 **9.3.1**
+
 - gitlab: upgrade to CE v9.3.1
 
 **9.3.0-1**
+
 - Add the missing Gitaly config to let git commands over http/https working
 
 **9.3.0**
+
 - gitlab: upgrade to CE v9.3.0
 - update baseimage to `14.04.20170608`
 - Add `DB_COLLATION` (For MySQL related doesn't recognize by postgres)
@@ -2155,84 +2466,108 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Add `GITALY_ADDRESS`
 
 **9.2.7**
+
 - gitlab: upgrade to CE v9.2.7
 
 **9.2.6**
+
 - gitlab: upgrade to CE v9.2.6
 
 **9.2.5**
+
 - gitlab: upgrade to CE v9.2.5
 
 **9.2.2**
+
 - gitlab: upgrade to CE v9.2.2
 
 **9.2.1**
+
 - gitlab: upgrade to CE v9.2.1
 
 **9.2.0**
+
 - gitlab: upgrade to CE v9.2.0
 - Add flexibility to use versions committed into gitlab-ce
 
 **9.1.4**
+
 - gitlab: upgrade to CE v9.1.4
 
 **9.1.3**
+
 - gitlab: upgrade to CE v9.1.3
 
 **9.1.2**
+
 - gitlab: upgrade to CE v9.1.2
 - update baseimage to `14.04.20170503`
 
 **9.1.1**
+
 - gitlab: upgrade to CE v9.1.1
 
 **9.1.0-1**
+
 - Fix gitlab-workhorse version display
 
 **9.1.0**
+
 - gitlab: upgrade to CE v9.1.0
 - gitlab-shell: upgrade to 5.0.2
 - gitlab-workhorse: upgrade to 1.4.3
 
 **9.0.6**
+
 - gitlab: upgrade to CE v9.0.6
 
 **9.0.5**
+
 - gitlab: upgrade to CE v9.0.5
 
 **9.0.4**
+
 - gitlab: upgrade to CE v9.0.4
 
 **9.0.3**
+
 - gitlab: upgrade to CE v9.0.3
 
 **9.0.2**
+
 - gitlab: upgrade to CE v9.0.2
 
 **9.0.1**
+
 - gitlab: upgrade to CE v9.0.1
 - gitlab-workhorse 1.4.2
 
 **9.0.0**
+
 - gitlab: upgrade to CE v9.0.0
 - gitlab-shell 5.0.0
 - gitlab-workhorse 1.4.1
 - gitlab-pages 0.4.0
 
 **8.17.4**
+
 - gitlab: upgrade to CE v8.17.4
 
 **8.17.3**
+
 - gitlab: upgrade to CE v8.17.3
 
 **8.17.2**
+
 - gitlab: upgrade to CE v8.17.2
 
 **8.17.1**
+
 - gitlab: upgrade to CE v8.17.1
 - fixes first problems with gitlab-pages
 
 **8.17.0**
+
 - gitlab: upgrade to CE v8.17.0
 - added `GITLAB_PAGES_ENABLED`
 - added `GITLAB_PAGES_DOMAIN`
@@ -2247,40 +2582,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added gitlab-pages daemon
 
 **8.16.6**
+
 - gitlab: upgrade to CE v8.16.6
 - Fix logical bug of Remote Backup
 
 **8.16.5**
+
 - gitlab: upgrade to CE v8.16.5
 
 **8.16.4**
+
 - gitlab: upgrade to CE v8.16.4
 
 **8.16.3**
+
 - gitlab: upgrade to CE v8.16.3
 
 **8.16.2**
+
 - gitlab: upgrade to CE v8.16.2
 
 **8.16.1**
+
 - gitlab: upgrade to CE v8.16.1
 
 **8.16.0**
+
 - gitlab: upgrade to CE v8.16.0
 
 **8.15.4**
+
 - gitlab: upgrade to CE v8.15.4
 
 **8.15.3**
+
 - gitlab: upgrade to CE v8.15.3
 
 **8.15.2**
+
 - gitlab: upgrade to CE v8.15.2
 
 **8.15.1**
+
 - gitlab: upgrade to CE v8.15.1
 
 **8.15.0**
+
 - gitlab: upgrade to CE v8.15.0
 - added `GITLAB_MATTERMOST_ENABLED`
 - added `GITLAB_MATTERMOST_URL`
@@ -2290,29 +2637,37 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added `OAUTH_AUTHENTIQ_REDIRECT_URI`
 
 **8.14.5**
+
 - gitlab: upgrade to CE v8.14.5
 
 **8.14.4**
+
 - gitlab: upgrade to CE v8.14.4
 
 **8.14.3**
+
 - gitlab: upgrade to CE v8.14.3
 
 **8.14.2**
+
 - gitlab: upgrade to CE v8.14.2
 
 **8.14.1**
+
 - gitlab: upgrade to CE v8.14.1
 
 **8.14.0**
+
 - gitlab: upgrade to CE v8.14.0
 - added `IMAP_TIMEOUT`
 - update golang to 1.6.3
 
 **8.13.6**
+
 - gitlab: upgrade to CE v8.13.6
 
 **8.13.5**
+
 - gitlab: upgrade to CE v8.13.5
 
 **Important**:
@@ -2322,31 +2677,40 @@ information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13
 **8.12.1**
 
 **8.13.3**
+
 - gitlab: upgrade to CE v8.13.3
 
 **8.13.2**
+
 - gitlab: upgrade to CE v8.13.2
 
 **8.13.1**
+
 - gitlab: upgrade to CE v8.13.1
 
 **8.13.0**
+
 - gitlab: upgrade to CE v8.13.0
 - added `GITLAB_EMAIL_SUBJECT_SUFFIX`
 
 **8.12.7**
+
 - gitlab: upgrade to CE v8.12.7
 
 **8.12.6**
+
 - gitlab: upgrade to CE v8.12.6
 
 **8.12.5**
+
 - gitlab: upgrade to CE v8.12.5
 
 **8.12.4**
+
 - gitlab: upgrade to CE v8.12.4
 
 **8.12.3**
+
 - gitlab: upgrade to CE v8.12.3
 
 **Important**:
@@ -2354,30 +2718,39 @@ We skipped `8.12.2` because it doesn't contain any changes. For more
 information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/)
 
 **8.12.1**
+
 - gitlab: upgrade to CE v8.12.1
 
 **8.12.0**
+
 - gitlab: upgrade to CE v8.12.0
 
 **8.11.7**
+
 - gitlab: upgrade to CE v8.11.7
 
 **8.11.6**
+
 - gitlab: upgrade to CE v8.11.6
 
 **8.11.5**
+
 - gitlab: upgrade to CE v8.11.5
 
 **8.11.4**
+
 - gitlab: upgrade to CE v8.11.4
 
 **8.11.3**
+
 - gitlab: upgrade to CE v8.11.3
 
 **8.11.2**
+
 - gitlab: upgrade to CE v8.11.2
 
 **8.11.0**
+
 - gitlab: upgrade to CE v8.11.0
 - added `GITLAB_SECRETS_SECRET_KEY_BASE`
 - added `GITLAB_SECRETS_OTP_KEY_BASE`
@@ -2386,94 +2759,123 @@ information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-r
 When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/.secret` for  `GITLAB_SECRETS_OTP_KEY_BASE` otherwise it will break your 2FA .
 
 **8.10.7**
+
 - gitlab: upgrade to CE v8.10.7
 
 **8.10.6**
+
 - gitlab: upgrade to CE v8.10.6
 
 **8.10.5**
+
 - gitlab: upgrade to CE v8.10.5
 
 **8.10.4**
+
 - gitlab: upgrade to CE v8.10.4
 
 **8.10.3**
+
 - gitlab: upgrade to CE v8.10.3
 
 **8.10.2-1**
+
 - Fix `OAUTH_GOOGLE_RESTRICT_DOMAIN`
 
 **8.10.2**
+
 - gitlab: upgrade to CE v8.10.2
 - Improve `OAUTH_GOOGLE_RESTRICT_DOMAIN` for multiple restricted domains
 
 **8.10.1**
+
 - gitlab: upgrade to CE v8.10.1
 
 **8.10.0**
+
 - gitlab: upgrade to CE v8.10.0
 
 **8.9.6**
+
 - gitlab: upgrade to CE v8.9.6
 
 **8.9.5**
+
 - gitlab: upgrade to CE v8.9.5
 
 **8.9.4**
+
 - gitlab: upgrade to CE v8.9.4
 
 **8.9.3**
+
 - gitlab: upgrade to CE v8.9.3
 
 **8.9.2**
+
 - gitlab: upgrade to CE v8.9.2
 
 **8.9.1**
+
 - gitlab: upgrade to CE v8.9.1
 
 **8.9.0**
+
 - gitlab: upgrade to CE v8.9.0
 
 **8.8.5-1**
+
 - added GitLab Container Registry support
 - added `SSL_CIPHERS` option to change ciphers of the nginx
 
 **8.8.5**
+
 - gitlab: upgrade to CE v8.8.5
 
 **8.8.4**
+
 - gitlab: upgrade to CE v8.8.4
 - added `GITLAB_PROJECTS_LIMIT` configuration option
 
 **8.8.3**
+
 - gitlab: upgrade to CE v8.8.3
 
 **8.8.2**
+
 - gitlab: upgrade to CE v8.8.2
 
 **8.8.1**
+
 - gitlab: upgrade to CE v8.8.1
 
 **8.8.0**
+
 - gitlab: upgrade to CE v8.8.0
 - oauth: exposed `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` options for users for GitHub Enterprise.
 
 **8.7.6**
+
 - gitlab: upgrade to CE v8.7.6
 
 **8.7.5**
+
 - gitlab: upgrade to CE v8.7.5
 
 **8.7.3**
+
 - gitlab: upgrade to CE v8.7.3
 
 **8.7.2**
+
 - gitlab: upgrade to CE v8.7.2
 
 **8.7.1**
+
 - gitlab: upgrade to CE v8.7.1
 
 **8.7.0**
+
 - gitlab-shell: upgrade to v.2.7.2
 - gitlab: upgrade to CE v8.7.0
 - SSO: `OAUTH_ALLOW_SSO` now specifies a comma separated list of providers.
@@ -2481,29 +2883,37 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - Exposed `GITLAB_TRUSTED_PROXIES` configuration parameter
 
 **8.6.7**
+
 - added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups
 - gitlab: upgrade to CE v8.6.7
 
 **8.6.6**
+
 - gitlab: upgrade to CE v8.6.6
 
 **8.6.5**
+
 - gitlab: upgrade to CE v8.6.5
 
 **8.6.4**
+
 - gitlab: upgrade to CE v8.6.4
 
 **8.6.3**
+
 - gitlab-shell: upgrade to v.2.6.12
 - gitlab: upgrade to CE v8.6.3
 
 **8.6.2**
+
 - gitlab: upgrade to CE v8.6.2
 
 **8.6.1**
+
 - gitlab: upgrade to CE v8.6.1
 
 **8.6.0**
+
 - gitlab-shell: upgrade to v.2.6.11
 - gitlab-workhorse: upgrade to v0.7.1
 - gitlab: upgrade to CE v8.6.0
@@ -2511,46 +2921,59 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - fixed relative_url support
 
 **8.5.8**
+
 - gitlab: upgrade to CE v8.5.8
 
 **8.5.7**
+
 - gitlab: upgrade to CE v8.5.7
 
 **8.5.5**
+
 - gitlab: upgrade to CE v8.5.5
 
 **8.5.4**
+
 - gitlab: upgrade to CE v8.5.4
 
 **8.5.3**
+
 - gitlab: upgrade to CE v8.5.3
 
 **8.5.1**
+
 - gitlab: upgrade to CE v8.5.1
 
 **8.5.0**
+
 - gitlab-workhorse: upgrade to v0.6.4
 - gitlab: upgrade to CE v8.5.0
 - firstrun: expose `GITLAB_ROOT_EMAIL` configuration option
 - expose `OAUTH_AUTO_LINK_SAML_USER` configuration parameter
 
 **8.4.4**
+
 - gitlab: upgrade to CE v8.4.4
 
 **8.4.3**
+
 - gitlab: upgrade to CE v8.4.3
 
 **8.4.2**
+
 - gitlab-workhorse: upgrade to v0.6.2
 - gitlab: upgrade to CE v8.4.2
 
 **8.4.1**
+
 - gitlab: upgrade to CE v8.4.1
 
 **8.4.0-1**
+
 - `assets:precompile` moved back to build time
 
 **8.4.0**
+
 - gitlab-shell: upgrade to v.2.6.10
 - gitlab-workhorse: upgrade to v0.6.1
 - gitlab: upgrade to CE v8.4.0
@@ -2559,20 +2982,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - `assets:precompile` executed at runtime
 
 **8.3.4**
+
 - gitlab-workhorse: upgrade to v0.5.4
 - gitlab: upgrade to CE v8.3.4
 - expose `LDAP_TIMEOUT` configuration parameter
 
 **8.3.2**
+
 - gitlab: upgrade to CE v8.3.2
 
 **8.3.1**
+
 - gitlab: upgrade to CE v8.3.1
 
 **8.3.0-1**
+
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 
 **8.3.0**
+
 - `envsubst` is now used for updating the configurations
 - renamed config `CA_CERTIFICATES_PATH` to `SSL_CA_CERTIFICATES_PATH`
 - renamed config `GITLAB_HTTPS_HSTS_ENABLED` to `NGINX_HSTS_ENABLED`
@@ -2585,20 +3013,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - gitlab-shell: upgrade to v.2.6.9
 
 **8.2.3**
+
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 - added `GITLAB_BACKUP_PG_SCHEMA` configuration parameter
 - gitlab: upgrade to CE v8.2.3
 
 **8.2.2**
+
 - added `GITLAB_DOWNLOADS_DIR` configuration parameter
 - `DB_TYPE` parameter renamed to `DB_ADAPTER` with `mysql2` and `postgresql` as accepted values
 - exposed `DB_ENCODING` parameter
 - gitlab: upgrade to CE v8.2.2
 
 **8.2.1-1**
+
 - fixed typo while setting the value of `GITLAB_ARTIFACTS_DIR`
 
 **8.2.1**
+
 - expose rack_attack configuration options
 - gitlab-shell: upgrade to v.2.6.8
 - gitlab: upgrade to CE v8.2.1
@@ -2606,6 +3038,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added `GITLAB_ARTIFACTS_DIR` configuration parameter
 
 **8.2.0**
+
 - gitlab-shell: upgrade to v.2.6.7
 - gitlab-workhorse: upgrade to v.0.4.2
 - gitlab: upgrade to CE v8.2.0
@@ -2615,53 +3048,67 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added `GITLAB_LFS_ENABLED` configuration parameter
 
 **8.1.4**
+
 - gitlab: upgrade to CE v8.1.4
 
 **8.1.3**
+
 - proper long-term fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - gitlab: upgrade to CE v8.1.3
 - Expose Facebook OAUTH configuration parameters
 
 **8.1.2**
+
 - gitlab: upgrade to CE v8.1.2
 - removed `GITLAB_SATELLITES_TIMEOUT` configuration parameter
 
 **8.1.0-2**
+
 - Recompile assets when `GITLAB_RELATIVE_URL_ROOT` is used Fixes #481
 
 **8.1.0-1**
+
 - temporary fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 
 **8.1.0**
+
 - gitlab: upgrade to CE v8.1.0
 - gitlab-git-http-server: upgrade to v0.3.0
 
 **8.0.5-1**
+
 - speed up container startup by compiling assets at image build time
 - test connection to redis-server
 
 **8.0.5**
+
 - gitlab: upgrade to CE v.8.0.5
 
 **8.0.4-2**
+
 - fix http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - allow user to override `OAUTH_ENABLED` setting
 
 **8.0.4-1**
+
 - update baseimage to `sameersbn/ubuntu:14.04.20151011`
 
 **8.0.4**
+
 - gitlab: upgrade to CE v.8.0.4
 
 **8.0.3**
+
 - gitlab: upgrade to CE v.8.0.3
 
 **8.0.2**
+
 - gitlab: upgrade to CE v.8.0.2
 - added `IMAP_STARTTLS` parameter, defaults to `false`
 - expose oauth parameters for crowd server
 
 **8.0.0**
+
 - set default value of `DB_TYPE` to `postgres`
 - added sample Kubernetes rc and service description files
 - expose `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` parameter
@@ -2674,71 +3121,91 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added CI redirection using `GITLAB_CI_HOST` parameter
 
 **7.14.3**
+
 - gitlab: upgrade to CE v.7.14.3
 
 **7.14.2**
+
 - Apply grsecurity policies to nodejs binary #394
 - Fix broken emojis post migration #196
 - gitlab-shell: upgrade to v.2.6.5
 - gitlab: upgrade to CE v.7.14.2
 
 **7.14.1**
+
 - gitlab: upgrade to CE v.7.14.1
 
 **7.14.0**
+
 - gitlab-shell: upgrade to v.2.6.4
 - gitlab: upgrade to CE v.7.14.0
 
 **7.13.5**
+
 - gitlab: upgrade to CE v.7.13.5
 
 **7.13.4**
+
 - gitlab: upgrade to CE v.7.13.4
 
 **7.13.3**
+
 - gitlab: upgrade to CE v.7.13.3
 
 **7.13.2**
+
 - gitlab: upgrade to CE v.7.13.2
 
 **7.13.1**
+
 - gitlab: upgrade to CE v.7.13.1
 
 **7.13.0**
+
 - expose SAML OAuth provider configuration
 - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration
 - gitlab: upgrade to CE v.7.13.0
 
 **7.12.2-2**
+
 - enable persistence `.secret` file used in 2FA
 
 **7.12.2-1**
+
 - fixed gitlab:backup:restore raketask
 
 **7.12.2**
+
 - gitlab: upgrade to CE v.7.12.2
 
 **7.12.1**
+
 - gitlab: upgrade to CE v.7.12.1
 
 **7.12.0**
+
 - added `SMTP_TLS` configuration parameter
 - gitlab: upgrade to CE v.7.12.0
 - added `OAUTH_AUTO_LINK_LDAP_USER` configuration parameter
 
 **7.11.4-1**
+
 - base image update to fix SSL vulnerability
 
 **7.11.4**
+
 - gitlab: upgrade to CE v.7.11.4
 
 **7.11.3**
+
 - gitlab: upgrade to CE v.7.11.3
 
 **7.11.2**
+
 - gitlab: upgrade to CE v.7.11.2
 
 **7.11.0**
+
 - init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option
 - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option
 - gitlab-shell: upgrade to v.2.6.3
@@ -2746,19 +3213,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter
 
 **7.10.4**
+
 - gitlab: upgrade to CE v.7.10.4
 
 **7.10.3**
+
 - gitlab: upgrade to CE v.7.10.3
 
 **7.10.2**
+
 - init: added support for remote AWS backups
 - gitlab: upgrade to CE v.7.10.2
 
 **7.10.1**
+
 - gitlab: upgrade to CE v.7.10.1
 
 **7.10.0**
+
 - gitlab-shell: upgrade to v.2.6.2
 - gitlab: upgrade to CE v.7.10.0
 - init: removed ENV variables to configure *External Issue Tracker* integration
@@ -2766,9 +3238,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added `LDAP_BLOCK_AUTO_CREATED_USERS` configuration option
 
 **7.9.4**
+
 - gitlab: upgrade to CE v.7.9.4
 
 **7.9.3**
+
 - added `NGINX_PROXY_BUFFERING` option
 - added `NGINX_ACCEL_BUFFERING` option
 - added `GITLAB_GRAVATAR_ENABLED` option
@@ -2778,13 +3252,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - gitlab: upgrade to CE v.7.9.3
 
 **7.9.2**
+
 - gitlab: upgrade to CE v.7.9.2
 
 **7.9.1**
+
 - init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `none`
 - gitlab: upgrade to CE v.7.9.1
 
 **7.9.0**
+
 - gitlab-shell: upgrade to v.2.6.0
 - gitlab: upgrade to CE v.7.9.0
 - init: set default value of `UNICORN_WORKERS` to `3`
@@ -2794,16 +3271,20 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added `GITLAB_EMAIL_DISPLAY_NAME` configuration option
 
 **7.8.4**
+
 - gitlab: upgrade to CE v.7.8.4
 
 **7.8.2**
+
 - gitlab: upgrade to CE v.7.8.2
 
 **7.8.1**
+
 - gitlab-shell: upgrade to v.2.5.4
 - gitlab: upgrade to CE v.7.8.1
 
 **7.8.0**
+
 - update postgresql client to the latest version, Closes #249
 - removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui
 - removed `GITLAB_SIGNIN` configuration option, can be set from gitlab ui
@@ -2816,13 +3297,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added gitlab oauth configuration support
 
 **7.7.2**
+
 - gitlab-shell: upgrade to v.2.4.2
 - gitlab: upgrade to CE v.7.7.2
 
 **7.7.1**
+
 - gitlab: upgrade to CE v.7.7.1
 
 **7.7.0**
+
 - init: added GOOGLE_ANALYTICS_ID configuration option
 - added support for mantis issue tracker
 - fixed log rotation configuration
@@ -2830,45 +3314,55 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - gitlab: upgrade to CE v.7.7.0
 
 **7.6.2**
+
 - gitlab: upgrade to CE v.7.6.2
 
 **7.6.1**
+
 - disable nginx ipv6 if host does not support it.
 - init: added GITLAB_BACKUP_TIME configuration option
 - gitlab: upgrade to CE v.7.6.1
 
 **7.6.0**
+
 - add support for configuring piwik
 - gitlab-shell: upgrade to v.2.4.0
 - gitlab: upgrade to CE v.7.6.0
 
 **7.5.3**
+
 - accept `BACKUP` parameter while running the restore rake task, closes #220
 - init: do not run `gitlab:satellites:create` rake task at startup
 - gitlab: upgrade to CE v.7.5.3
 
 **7.5.2**
+
 - gitlab: upgrade to CE v.7.5.2
 
 **7.5.1**
+
 - gitlab: upgrade to CE v.7.5.1
 - gitlab-shell to v2.2.0
 - added `GITLAB_TIMEZONE` configuration option
 - added `GITLAB_EMAIL_ENABLED` configuration option
 
 **7.4.4**
+
 - gitlab: upgrade to CE v.7.4.4
 - added `SSL_VERIFY_CLIENT` configuration option
 - added `NGINX_WORKERS` configuration option
 - added `USERMAP_UID` and `USERMAP_GID` configuration option
 
 **7.4.3**
+
 - gitlab: upgrade to CE v.7.4.3
 
 **7.4.2**
+
 - gitlab: upgrade to CE v.7.4.2
 
 **7.4.0**
+
 - gitlab: upgrade to CE v.7.4.0
 - config: added `LDAP_ACTIVE_DIRECTORY` configuration option
 - added SMTP_OPENSSL_VERIFY_MODE configuration option
@@ -2877,9 +3371,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - launch all daemons via supervisord
 
 **7.3.2-1**
+
 - fix mysql status check
 
 **7.3.2**
+
 - upgrade to gitlab-ce 7.3.2
 - removed internal mysql server
 - added support for fetching `DB_NAME`, `DB_USER` and `DB_PASS` from the postgresql linkage
@@ -2889,19 +3385,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added fig.yml
 
 **7.3.1-3**
+
 - fix mysql command again!
 
 **7.3.1-2**
+
 - fix mysql server status check
 
 **7.3.1-1**
+
 - plug bash vulnerability by switching to dash shell
 - automatically run the `gitlab:setup` rake task for new installs
 
 **7.3.1**
+
 - upgrade to gitlab-ce 7.3.1
 
 **7.3.0**
+
 - upgrade to gitlab-ce 7.3.0
 - added GITLAB_WEBHOOK_TIMEOUT configuration option
 - upgrade to gitlab-shell 2.0.0
@@ -2909,6 +3410,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - shutdown the container gracefully
 
 **7.2.2**
+
 - upgrade to gitlab-ce 7.2.2
 - added GITLAB_HTTPS_HSTS_ENABLED configuration option (advanced config)
 - added GITLAB_HTTPS_HSTS_MAXAGE configuration option (advanced config)
@@ -2919,21 +3421,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added GITLAB_USERNAME_CHANGE configuration option
 
 **7.2.1-1**
+
 - removed the GITLAB_HTTPS_ONLY configuration option
 - added NGINX_X_FORWARDED_PROTO configuration option
 - optimization: talk directly to the unicorn worker from gitlab-shell
 
 **7.2.1**
+
 - upgrade to gitlab-ce 7.2.1
 - added new SMTP_ENABLED configuration option.
 
 **7.2.0-1**
+
 - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used.
 - fix relative root access without the trailing '/' character
 - added separate server block for http config in gitlab.https.permissive. Fixes #127
 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option.
 
 **7.2.0**
+
 - upgrade to gitlab-ce 7.2.0
 - update to the sameersbn/ubuntu:14.04.20140818 baseimage
 - remove /var/lib/apt/lists to optimize image size.
@@ -2949,11 +3455,13 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - update to the sameersbn/ubuntu:14.04.20140812 baseimage
 
 **7.1.1**
+
 - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110
 - upgrade to gitlab-ce 7.1.1
 - run /etc/init.d/gitlab as git user, plays nicely with selinux
 
 **7.1.0**
+
 - removed GITLAB_SUPPORT configuration option
 - upgrade to gitlab-ce 7.1.0
 - clone gitlab-ce and gitlab-shell sources from the git repo.
@@ -2963,6 +3471,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - upgrade to nginx-1.6.x series from the nginx/stable ppa
 
 **7.0.0**
+
 - upgrade to gitlab-7.0.0
 - fix repository and gitlab-satellites directory permissions.
 - added GITLAB_RESTRICTED_VISIBILITY configuration option
@@ -2973,17 +3482,21 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - upgrade to gitlab-shell 1.9.5
 
 **6.9.2**
+
 - upgrade to gitlab-ce 6.9.2
 
 **6.9.1**
+
 - upgrade to gitlab-ce 6.9.1
 
 **6.9.0**
+
 - upgrade to gitlab-ce 6.9.0
 - added GITLAB_RELATIVE_URL_ROOT configuration option
 - added NGINX_MAX_UPLOAD_SIZE configuration to specify the maximum acceptable size of attachments.
 
 **6.8.2**
+
 - upgrade to gitlab-ce 6.8.2
 - renamed configuration option GITLAB_SHELL_SSH_PORT to GITLAB_SSH_PORT
 - added GITLAB_PROJECTS_VISIBILITY configuration option to specify the default project visibility level.
@@ -3005,9 +3518,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - fix symlink to uploads directory
 
 **6.8.1**
+
 - upgrade to gitlab-ce 6.8.1
 
 **6.8.0**
+
 - upgrade to gitlab-shell 1.9.3
 - added GITLAB_SIGNIN setting to enable or disable standard login form
 - upgraded to gitlab-ce version 6.8.0
@@ -3016,29 +3531,35 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - install postgresql-client to fix restoring backups when used with a postgresql database backend.
 
 **6.7.5**
+
 - upgrade gitlab to 6.7.5
 - support linking to mysql and postgresql containers
 - added DEFAULT_PROJECTS_LIMIT configuration option
 
 **6.7.4**
+
 - upgrade gitlab to 6.7.4
 - added SMTP_AUTHENTICATION configuration option, defaults to :login.
 - added LDAP configuration options.
 
 **6.7.3**
+
 - upgrade gitlab to 6.7.3
 - install ruby2.0 from ppa
 
 **6.7.2**
+
 - upgrade gitlab to 6.7.2
 - upgrade gitlab-shell to 1.9.1
 - reorganize repo
-- do not perform system upgrades (http://crosbymichael.com/dockerfile-best-practices-take-2.html)
+- do not perform system upgrades (<http://crosbymichael.com/dockerfile-best-practices-take-2.html>)
 
 **6.6.5**
+
 - upgraded to gitlab-6.6.5
 
 **v6.6.4**
+
 - upgraded to gitlab-6.6.4
 - added changelog
 - removed postfix mail delivery
@@ -3049,6 +3570,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - changed backup time to 4am (UTC)
 
 **v6.6.2**
+
 - upgraded to gitlab-6.6.2
 - added automated daily/monthly backups feature
 - documented ssh login details for maintenance tasks.
@@ -3058,5 +3580,6 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - documented hardware requirements
 
 **v6.6.1**
+
 - upgraded to gitlabhq-6.6.1
 - reformatted README

From 0392d287c1a60f018fdaed035ae61bb9554ecec6 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 20:25:09 +0200
Subject: [PATCH 1035/1124] Update and lint Changelog.md

---
 Changelog.md | 1327 +++++++++++++++++++++++++-------------------------
 1 file changed, 661 insertions(+), 666 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b4891f8fc..f6dc204e7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,7 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
-**18.0.0**
+## 18.0.0
 
 - gitlab: upgrade CE to v18.0.0
 - gitaly: upgrade to v18.0.0
@@ -12,7 +12,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - rubygems: upgrade to v3.6.9
 - ubuntu: upgrade to noble-20250415.1
 
-**17.11.2**
+## 17.11.2
 
 - gitlab: upgrade CE to v17.11.2
 - gitaly: upgrade to v17.11.2
@@ -20,27 +20,27 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.3
 - ubuntu: upgrade to jammy-20250415.1
 
-**17.11.1**
+## 17.11.1
 
 - gitlab: upgrade CE to v17.11.1
 - gitaly: upgrade to v17.11.1
 - gitlab-pages: upgrade to v17.11.1
 - rubygems: upgrade to v3.6.8
 
-**17.11.0**
+## 17.11.0
 
 - gitlab: upgrade CE to v17.11.0
 - gitaly: upgrade to v17.11.0
 - gitlab-pages: upgrade to v17.11.0
 
-**17.10.4**
+## 17.10.4
 
 - gitlab: upgrade CE to v17.10.4
 - gitaly: upgrade to v17.10.4
 - gitlab-pages: upgrade to v17.10.4
 - ubuntu: upgrade to jammy-20250404
 
-**17.10.3**
+## 17.10.3
 
 - gitlab: upgrade CE to v17.10.3
 - gitaly: upgrade to v17.10.3
@@ -48,13 +48,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.2
 - ruby: upgrade to v3.2.8
 
-**17.10.1**
+## 17.10.1
 
 - gitlab: upgrade CE to v17.10.1
 - gitaly: upgrade to v17.10.1
 - gitlab-pages: upgrade to v17.10.1
 
-**17.10.0**
+## 17.10.0
 
 - gitlab: upgrade CE to v17.10.0
 - gitaly: upgrade to v17.10.0
@@ -62,19 +62,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.24.1
 - rubygems: upgrade to v3.6.6
 
-**17.9.2**
+## 17.9.2
 
 - gitlab: upgrade CE to v17.9.2
 - gitaly: upgrade to v17.9.2
 - gitlab-pages: upgrade to v17.9.2
 
-**17.9.1**
+## 17.9.1
 
 - gitlab: upgrade CE to v17.9.1
 - gitaly: upgrade to v17.9.1
 - gitlab-pages: upgrade to v17.9.1
 
-**17.9.0**
+## 17.9.0
 
 - gitlab: upgrade CE to v17.9.0
 - gitaly: upgrade to v17.9.0
@@ -84,7 +84,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - rubygems: upgrade to v3.5.23
 - ubuntu: upgrade to jammy-20250126
 
-**17.8.2**
+## 17.8.2
 
 - gitlab: upgrade CE to v17.8.2
 - gitaly: upgrade to v17.8.2
@@ -92,25 +92,25 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.6
 - ruby: upgrade to v3.2.7
 
-**17.8.1**
+## 17.8.1
 
 - gitlab: upgrade CE to v17.8.1
 - gitaly: upgrade to v17.8.1
 - gitlab-pages: upgrade to v17.8.1
 
-**17.8.0**
+## 17.8.0
 
 - gitlab: upgrade CE to v17.8.0
 - gitaly: upgrade to v17.8.0
 - gitlab-pages: upgrade to v17.8.0
 
-**17.7.1**
+## 17.7.1
 
 - gitlab: upgrade CE to v17.7.1
 - gitaly: upgrade to v17.7.1
 - gitlab-pages: upgrade to v17.7.1
 
-**17.7.0**
+## 17.7.0
 
 - gitlab: upgrade CE to v17.7.0
 - gitaly: upgrade to v17.7.0
@@ -118,32 +118,32 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to jammy-20240911.1
 - update healthcheck for postgresql
 
-**17.6.3**
+## 17.6.3
 
 - gitlab: upgrade CE to v17.6.3
 - gitaly: upgrade to v17.6.3
 - gitlab-pages: upgrade to v17.6.3
 
-**17.6.2**
+## 17.6.2
 
 - gitlab: upgrade CE to v17.6.2
 - gitaly: upgrade to v17.6.2
 - gitlab-pages: upgrade to v17.6.2
 
-**17.6.1**
+## 17.6.1
 
 - gitlab: upgrade CE to v17.6.1
 - gitlab-pages: upgrade to v17.6.1
 - gitaly: upgrade to v17.6.1
 - golang: upgrade to v1.23.5
 
-**17.6.0**
+## 17.6.0
 
 - gitlab: upgrade CE to v17.6.0
 - gitaly: upgrade to v17.6.0
 - gitlab-pages: upgrade to v17.6.0
 
-**17.5.2**
+## 17.5.2
 
 - gitlab: upgrade CE to v17.5.2
 - gitaly: upgrade to v17.5.2
@@ -151,20 +151,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.2
 - ruby: upgrade to v3.2.6
 
-**17.5.1**
+## 17.5.1
 
 - gitlab: upgrade CE to v17.5.1
 - gitaly: upgrade to v17.5.1
 - gitlab-pages: upgrade to v17.5.1
 
-**17.5.0**
+## 17.5.0
 
 - gitlab: upgrade CE to v17.5.0
 - gitaly: upgrade to v17.5.0
 - gitlab-pages: upgrade to v17.5.0
 - ubuntu: upgrade to focal-20241011
 
-**17.4.2**
+## 17.4.2
 
 - gitlab: upgrade CE to v17.4.2
 - gitaly: upgrade to v17.4.2
@@ -172,39 +172,39 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.23.2
 - ubuntu: upgrade to focal-20240918
 
-**17.4.1**
+## 17.4.1
 
 - gitlab: upgrade CE to v17.4.1
 - gitaly: upgrade to v17.4.1
 - gitlab-pages: upgrade to v17.4.1
 
-**17.4.0**
+## 17.4.0
 
 - gitlab: upgrade CE to v17.4.0
 - gitaly: upgrade to v17.4.0
 - gitlab-pages: upgrade to v17.4.0
 - gitlab-shell: upgrade to v14.39.0
 
-**17.3.3**
+## 17.3.3
 
 - gitlab: upgrade CE to v17.3.3
 - gitaly: upgrade to v17.3.3
 - gitlab-pages: upgrade to v17.3.3
 
-**17.3.2**
+## 17.3.2
 
 - gitlab: upgrade CE to v17.3.2
 - gitaly: upgrade to v17.3.2
 - gitlab-pages: upgrade to v17.3.2
 - golang: upgrade to v1.23.1
 
-**17.3.1**
+## 17.3.1
 
 - gitlab: upgrade CE to v17.3.1
 - gitaly: upgrade to v17.3.1
 - gitlab-pages: upgrade to v17.3.1
 
-**17.3.0**
+## 17.3.0
 
 - gitlab: upgrade CE to v17.3.0
 - gitaly: upgrade to v17.3.0
@@ -212,48 +212,48 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.38.0
 - golang: upgrade to v1.23.0
 
-**17.2.2**
+## 17.2.2
 
 - gitlab: upgrade CE to v17.2.2
 - gitaly: upgrade to v17.2.2
 - gitlab-pages: upgrade to v17.2.2
 - golang: upgrade to v1.22.6
 
-**17.2.1**
+## 17.2.1
 
 - gitlab: upgrade CE to v17.2.1
 - gitaly: upgrade to v17.2.1
 - gitlab-pages: upgrade to v17.2.1
 - ruby: upgrade to v3.2.5
 
-**17.2.0**
+## 17.2.0
 
 - gitlab: upgrade CE to v17.2.0
 - gitaly: upgrade to v17.2.0
 - gitlab-pages: upgrade to v17.2.0
 - gitlab-shell: upgrade to v14.37.0
 
-**17.1.2**
+## 17.1.2
 
 - gitlab: upgrade CE to v17.1.2
 - gitaly: upgrade to v17.1.2
 - gitlab-pages: upgrade to v17.1.2
 - golang: upgrade to v1.22.5
 
-**17.1.1**
+## 17.1.1
 
 - gitlab: upgrade CE to v17.1.1
 - gitaly: upgrade to v17.1.1
 - gitlab-pages: upgrade to v17.1.1
 
-**17.1.0**
+## 17.1.0
 
 - gitlab: upgrade CE to v17.1.0
 - gitaly: upgrade to v17.1.0
 - gitlab-pages: upgrade to v17.1.0
 - gitlab-shell: upgrade to v14.36.0
 
-**17.0.2**
+## 17.0.2
 
 - gitlab: upgrade CE to v17.0.2
 - gitaly: upgrade to v17.0.2
@@ -261,20 +261,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.4
 - ubuntu: upgrade to focal-20240530
 
-**17.0.1**
+## 17.0.1
 
 - gitlab: upgrade CE to v17.0.1
 - gitaly: upgrade to v17.0.1
 - gitlab-pages: upgrade to v17.0.1
 
-**17.0.0**
+## 17.0.0
 
 - gitlab: upgrade CE to v17.0.0
 - gitaly: upgrade to v17.0.0
 - gitlab-pages: upgrade to v17.0.0
 - gitlab-shell: upgrade to v14.35.0
 
-**16.11.2**
+## 16.11.2
 
 - gitlab: upgrade CE to v16.11.2
 - gitaly: upgrade to v16.11.2
@@ -282,7 +282,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.3
 - ubuntu: upgrade to focal-20240427
 
-**16.11.1**
+## 16.11.1
 
 - gitlab: upgrade CE to v16.11.1
 - gitaly: upgrade to v16.11.1
@@ -290,41 +290,41 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v3.2.4
 - ubuntu: upgrade to focal-20240416
 
-**16.11.0**
+## 16.11.0
 
 - gitlab: upgrade CE to v16.11.0
 - gitaly: upgrade to v16.11.0
 - gitlab-pages: upgrade to v16.11.0
 - gitlab-shell: upgrade to v14.35.0
 
-**16.10.3**
+## 16.10.3
 
 - gitlab: upgrade CE to v16.10.3
 - gitaly: upgrade to v16.10.3
 - gitlab-pages: upgrade to v16.10.3
 - ubuntu: upgrade to focal-20240410
 
-**16.10.2**
+## 16.10.2
 
 - gitlab: upgrade CE to v16.10.2
 - gitaly: upgrade to v16.10.2
 - gitlab-pages: upgrade to v16.10.2
 - golang: upgrade to v1.22.2
 
-**16.10.1**
+## 16.10.1
 
 - gitlab: upgrade CE to v16.10.1
 - gitaly: upgrade to v16.10.1
 - gitlab-pages: upgrade to v16.10.1
 
-**16.10.0**
+## 16.10.0
 
 - gitlab: upgrade CE to v16.10.0
 - gitaly: upgrade to v16.10.0
 - gitlab-pages: upgrade to v16.10.0
 - gitlab-shell: upgrade to v14.34.0
 
-**16.9.2**
+## 16.9.2
 
 - gitlab: upgrade CE to v16.9.2
 - gitaly: upgrade to v16.9.2
@@ -332,19 +332,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.1
 - ubuntu: upgrade to focal-20240216
 
-**16.9.1**
+## 16.9.1
 
 - gitlab: upgrade CE to v16.9.1
 - gitaly: upgrade to v16.9.1
 - gitlab-pages: upgrade to v16.9.1
 
-**16.9.0**
+## 16.9.0
 
 - gitlab: upgrade CE to v16.9.0
 - gitaly: upgrade to v16.9.0
 - gitlab-pages: upgrade to v16.9.0
 
-**16.8.2**
+## 16.8.2
 
 - gitlab: upgrade CE to v16.8.2
 - gitaly: upgrade to v16.8.2
@@ -352,33 +352,33 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.22.0
 - ubuntu: upgrade to focal-20240123
 
-**16.8.1**
+## 16.8.1
 
 - gitlab: upgrade CE to v16.8.1
 - gitaly: upgrade to v16.8.1
 - gitlab-pages: upgrade to v16.8.1
 - gitlab-shell: upgrade to v14.33.0
 
-**16.8.0**
+## 16.8.0
 
 - gitlab: upgrade CE to v16.8.0
 - gitaly: upgrade to v16.8.0
 - gitlab-pages: upgrade to v16.8.0
 
-**16.7.3**
+## 16.7.3
 
 - gitlab: upgrade CE to v16.7.3
 - gitaly: upgrade to v16.7.3
 - gitlab-pages: upgrade to v16.7.3
 
-**16.7.2**
+## 16.7.2
 
 - gitlab: upgrade CE to v16.7.2
 - gitaly: upgrade to v16.7.2
 - gitlab-pages: upgrade to v16.7.2
 - golang: upgrade to v1.21.6
 
-**16.7.0**
+## 16.7.0
 
 - gitlab: upgrade CE to v16.7.0
 - gitaly: upgrade to v16.7.0
@@ -386,7 +386,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.32.0
 - ruby: upgrade to v3.1.4
 
-**16.6.2**
+## 16.6.2
 
 - gitlab: upgrade CE to v16.6.2
 - gitaly: upgrade to v16.6.2
@@ -394,14 +394,14 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.21.5
 - ubuntu: upgrade to focal-20231211
 
-**16.6.1**
+## 16.6.1
 
 - gitlab: upgrade CE to v16.6.1
 - gitaly: upgrade to v16.6.1
 - gitlab-pages: upgrade to v16.6.1
 - ubuntu: upgrade to focal-20231128
 
-**16.6.0**
+## 16.6.0
 
 - gitlab: upgrade CE to v16.6.0
 - gitaly: upgrade to v16.6.0
@@ -409,13 +409,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.30.0
 - golang: upgrade to v1.21.4
 
-**16.5.1**
+## 16.5.1
 
 - gitlab: upgrade CE to v16.5.1
 - gitaly: upgrade to v16.5.1
 - gitlab-pages: upgrade to v16.5.1
 
-**16.5.0**
+## 16.5.0
 
 - gitlab: upgrade CE to v16.5.0
 - gitaly: upgrade to v16.5.0
@@ -424,64 +424,64 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.21.3
 - ubuntu: upgrade to focal-20231003
 
-**16.4.1**
+## 16.4.1
 
 - gitlab: upgrade CE to v16.4.1
 - gitaly: upgrade to v16.4.1
 - gitlab-pages: upgrade to v16.4.1
 
-**16.4.0**
+## 16.4.0
 
 - gitlab: upgrade CE to v16.4.0
 - gitaly: upgrade to v16.4.0
 - gitlab-pages: upgrade to v16.4.0
 - gitlab-shell: upgrade to v14.28.0
 
-**16.3.4**
+## 16.3.4
 
 - gitlab: upgrade CE to v16.3.4
 - gitaly: upgrade to v16.3.4
 - gitlab-pages: upgrade to v16.3.4
 
-**16.3.3**
+## 16.3.3
 
 - gitlab: upgrade CE to v16.3.3
 - gitaly: upgrade to v16.3.3
 - gitlab-pages: upgrade to v16.3.3
 
-**16.3.2**
+## 16.3.2
 
 - gitlab: upgrade CE to v16.3.2
 - gitaly: upgrade to v16.3.2
 - gitlab-pages: upgrade to v16.3.2
 - golang: upgrade to v1.21.1
 
-**16.3.1**
+## 16.3.1
 
 - gitlab: upgrade CE to v16.3.1
 - gitaly: upgrade to v16.3.1
 - gitlab-pages: upgrade to v16.3.1
 
-**16.3.0**
+## 16.3.0
 
 - gitlab: upgrade CE to v16.3.0
 - gitaly: upgrade to v16.3.0
 - gitlab-pages: upgrade to v16.3.0
 
-**16.2.4**
+## 16.2.4
 
 - gitlab: upgrade CE to v16.2.4
 - gitaly: upgrade to v16.2.4
 - gitlab-pages: upgrade to v16.2.4
 - golang: upgrade to v1.21.0
 
-**16.2.3**
+## 16.2.3
 
 - gitlab: upgrade CE to v16.2.3
 - gitaly: upgrade to v16.2.3
 - gitlab-pages: upgrade to v16.2.3
 
-**16.2.2**
+## 16.2.2
 
 - gitlab: upgrade CE to v16.2.2
 - gitaly: upgrade to v16.2.2
@@ -489,131 +489,131 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.20.7
 - ubuntu: upgrade to focal-20230801
 
-**16.2.1**
+## 16.2.1
 
 - gitlab: upgrade CE to v16.2.1
 - gitaly: upgrade to v16.2.1
 - gitlab-pages: upgrade to v16.2.1
 
-**16.2.0**
+## 16.2.0
 
 - gitlab: upgrade CE to v16.2.0
 - gitaly: upgrade to v16.2.0
 - gitlab-pages: upgrade to v16.2.0
 - golang: upgrade to v1.20.6
 
-**16.1.2**
+## 16.1.2
 
 - gitlab: upgrade CE to v16.1.2
 - gitaly: upgrade to v16.1.2
 - gitlab-pages: upgrade to v16.1.2
 - ubuntu: upgrade to focal-20230624
 
-**16.1.1**
+## 16.1.1
 
 - gitlab: upgrade CE to v16.1.1
 - gitaly: upgrade to v16.1.1
 - gitlab-pages: upgrade to v16.1.1
 
-**16.1.0**
+## 16.1.0
 
 - gitlab: upgrade CE to v16.1.0
 - gitaly: upgrade to v16.1.0
 - gitlab-pages: upgrade to v16.1.0
 - gitlab-shell: upgrade to v14.23.0
 
-**16.0.5**
+## 16.0.5
 
 - gitlab: upgrade CE to v16.0.5
 - gitaly: upgrade to v16.0.5
 - gitlab-pages: upgrade to v16.0.5
 - ubuntu: upgrade to focal-20230605
 
-**16.0.4**
+## 16.0.4
 
 - gitlab: upgrade CE to v16.0.4
 - gitaly: upgrade to v16.0.4
 - gitlab-pages: upgrade to v16.0.4
 
-**16.0.3**
+## 16.0.3
 
 - gitlab: upgrade CE to v16.0.3
 - gitaly: upgrade to v16.0.3
 - gitlab-pages: upgrade to v16.0.3
 
-**16.0.2**
+## 16.0.2
 
 - gitlab: upgrade CE to v16.0.2
 - gitaly: upgrade to v16.0.2
 - gitlab-pages: upgrade to v16.0.2
 - golang: upgrade to v1.20.5
 
-**16.0.1**
+## 16.0.1
 
 - gitlab: upgrade CE to v16.0.1
 - gitaly: upgrade to v16.0.1
 - gitlab-pages: upgrade to v16.0.1
 
-**16.0.0**
+## 16.0.0
 
 - gitlab: upgrade CE to v16.0.0
 - gitaly: upgrade to v16.0.0
 - gitlab-pages: upgrade to v16.0.0
 - gitlab-shell: upgrade to v14.20.0
 
-**15.11.5**
+## 15.11.5
 
 - gitlab: upgrade CE to v15.11.5
 - gitaly: upgrade to v15.11.5
 - gitlab-pages: upgrade to v15.11.5
 
-**15.11.4**
+## 15.11.4
 
 - gitlab: upgrade CE to v15.11.4
 - gitaly: upgrade to v15.11.4
 - gitlab-pages: upgrade to v15.11.4
 
-**15.11.3**
+## 15.11.3
 
 - gitlab: upgrade CE to v15.11.3
 - gitaly: upgrade to v15.11.3
 - gitlab-pages: upgrade to v15.11.3
 - ruby: upgrade to v3.0.6
 
-**15.11.2**
+## 15.11.2
 
 - gitlab: upgrade CE to v15.11.2
 - gitaly: upgrade to v15.11.2
 - gitlab-pages: upgrade to v15.11.2
 
-**15.11.1**
+## 15.11.1
 
 - gitlab: upgrade CE to v15.11.1
 - gitaly: upgrade to v15.11.1
 - gitlab-pages: upgrade to v15.11.1
 - golang: upgrade to v1.20.4
 
-**15.11.0**
+## 15.11.0
 
 - gitlab: upgrade CE to v15.11.0
 - gitaly: upgrade to v15.11.0
 - gitlab-pages: upgrade to v15.11.0
 - ubuntu: upgrade to focal-20230412
 
-**15.10.3**
+## 15.10.3
 
 - gitlab: upgrade CE to v15.10.3
 - gitaly: upgrade to v15.10.3
 - gitlab-pages: upgrade to v15.10.3
 
-**15.10.2**
+## 15.10.2
 
 - gitlab: upgrade CE to v15.10.2
 - gitaly: upgrade to v15.10.2
 - gitlab-pages: upgrade to v15.10.2
 - golang: upgrade to v1.20.3
 
-**15.10.1**
+## 15.10.1
 
 - gitlab: upgrade CE to v15.10.1
 - gitaly: upgrade to v15.10.1
@@ -621,7 +621,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v2.7.8
 - ubuntu: upgrade to focal-20230308
 
-**15.10.0**
+## 15.10.0
 
 - gitlab: upgrade CE to v15.10.0
 - gitaly: upgrade to v15.10.0
@@ -629,52 +629,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.18.0
 - ubuntu: upgrade to focal-20230308
 
-**15.9.3**
+## 15.9.3
 
 - gitlab: upgrade CE to v15.9.3
 - gitaly: upgrade to v15.9.3
 - gitlab-pages: upgrade to v15.9.3
 - golang: upgrade to v1.20.2
 
-**15.9.2**
+## 15.9.2
 
 - gitlab: upgrade CE to v15.9.2
 - gitaly: upgrade to v15.9.2
 - gitlab-pages: upgrade to v15.9.2
 - ubuntu: upgrade to focal-20230301
 
-**15.9.1**
+## 15.9.1
 
 - gitlab: upgrade CE to v15.9.1
 - gitaly: upgrade to v15.9.1
 - gitlab-pages: upgrade to v15.9.1
 
-**15.9.0**
+## 15.9.0
 
 - gitlab: upgrade CE to v15.9.0
 - gitaly: upgrade to v15.9.0
 - gitlab-pages: upgrade to v15.9.0
 - gitlab-shell: upgrade to v14.17.0
 
-**15.8.2**
+## 15.8.2
 
 - gitlab: upgrade CE to v15.8.2
 - gitaly: upgrade to v15.8.2
 - gitlab-pages: upgrade to v15.8.2
 - golang: upgrade to v1.19.6
 
-**15.8.1**
+## 15.8.1
 
 - gitlab: upgrade CE to v15.8.1
 - gitaly: upgrade to v15.8.1
 - gitlab-pages: upgrade to v15.8.1
 - ubuntu: upgrade to focal-20230126
 
-**15.8.0-1**
+## 15.8.0-1
 
 - ruby: rollback to v2.7.7
 
-**15.8.0**
+## 15.8.0
 
 - gitlab: upgrade CE to v15.8.0
 - gitaly: upgrade to v15.8.0
@@ -682,31 +682,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.15.0
 - golang: upgrade to v1.18.10
 
-**15.7.5**
+## 15.7.5
 
 - gitlab: upgrade CE to v15.7.5
 - gitaly: upgrade to v15.7.5
 - gitlab-pages: upgrade to v15.7.5
 
-**15.7.3**
+## 15.7.3
 
 - gitlab: upgrade CE to v15.7.3
 - gitaly: upgrade to v15.7.3
 - gitlab-pages: upgrade to v15.7.3
 
-**15.7.2**
+## 15.7.2
 
 - gitlab: upgrade CE to v15.7.2
 - gitaly: upgrade to v15.7.2
 - gitlab-pages: upgrade to v15.7.2
 
-**15.7.1**
+## 15.7.1
 
 - gitlab: upgrade CE to v15.7.1
 - gitaly: upgrade to v15.7.1
 - gitlab-pages: upgrade to v15.7.1
 
-**15.7.0**
+## 15.7.0
 
 - gitlab: upgrade CE to v15.7.0
 - gitaly: upgrade to v15.7.0
@@ -714,7 +714,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.14.0
 - ruby: upgrade to v3.0.5
 
-**15.6.3**
+## 15.6.3
 
 - gitlab: upgrade CE to v15.6.3
 - gitaly: upgrade to v15.6.3
@@ -723,17 +723,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v2.7.7
 - ruby: upgrade to v3.0.4
 
-**15.6.2**
+## 15.6.2
 
 - gitlab: upgrade CE to v15.6.2
 - gitaly: upgrade to v15.6.2
 
-**15.6.1**
+## 15.6.1
 
 - gitlab: upgrade CE to v15.6.1
 - gitaly: upgrade to v15.6.1
 
-**15.6.0**
+## 15.6.0
 
 - gitlab: upgrade CE to v15.6.0
 - gitaly: upgrade to v15.6.0
@@ -741,71 +741,71 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.63.0
 - golang: upgrade to v1.18.8
 
-**15.5.4**
+## 15.5.4
 
 - gitlab: upgrade CE to v15.5.4
 - gitaly: upgrade to v15.5.4
 
-**15.5.3**
+## 15.5.3
 
 - gitlab: upgrade CE to v15.5.3
 - gitaly: upgrade to v15.5.3
 
-**15.5.2**
+## 15.5.2
 
 - gitlab: upgrade CE to v15.5.2
 - gitaly: upgrade to v15.5.2
 - ubuntu: upgrade to focal-20221019
 
-**15.5.1**
+## 15.5.1
 
 - gitlab: upgrade CE to v15.5.1
 - gitaly: upgrade to v15.5.1
 
-**15.5.0**
+## 15.5.0
 
 - gitlab: upgrade CE to v15.5.0
 - gitaly: upgrade to v15.5.0
 - gitlab-shell: upgrade to v14.12.0
 
-**15.4.3**
+## 15.4.3
 
 - gitlab: upgrade CE to v15.4.3
 - gitaly: upgrade to v15.4.3
 - ubuntu: upgrade to focal-20220922
 
-**15.4.2**
+## 15.4.2
 
 - gitlab: upgrade CE to v15.4.2
 - gitaly: upgrade to v15.4.2
 
-**15.4.1**
+## 15.4.1
 
 - gitlab: upgrade CE to v15.4.1
 - gitaly: upgrade to v15.4.1
 
-**15.4.0**
+## 15.4.0
 
 - gitlab: upgrade CE to v15.4.0
 - gitaly: upgrade to v15.4.0
 - ubuntu: upgrade tofocal-20220826
 
-**15.3.3**
+## 15.3.3
 
 - gitlab: upgrade CE to v15.3.3
 - gitaly: upgrade to v15.3.3
 
-**15.3.2**
+## 15.3.2
 
 - gitlab: upgrade CE to v15.3.2
 - gitaly: upgrade to v15.3.2
 
-**15.3.1**
+## 15.3.1
 
 - gitlab: upgrade CE to v15.3.1
 - gitaly: upgrade to v15.3.1
 
-**15.3.0**
+## 15.3.0
 
 - gitlab: upgrade CE to v15.3.0
 - gitaly: upgrade to v15.3.0
@@ -813,19 +813,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.62.0
 - ubuntu: upgrade to focal-20220801
 
-**15.2.2**
+## 15.2.2
 
 - gitlab: upgrade CE to v15.2.2
 - gitaly: upgrade to v15.2.2
 - golang: upgrade to v1.17.13
 
-**15.2.1**
+## 15.2.1
 
 - gitlab: upgrade CE to v15.2.1
 - gitaly: upgrade to v15.2.1
 - gitlab-pages: upgrade to v1.61.1
 
-**15.2.0**
+## 15.2.0
 
 - gitlab: upgrade CE to v15.2.0
 - gitaly: upgrade to v15.2.0
@@ -833,46 +833,46 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.61.0
 - golang: upgrade to v1.17.12
 
-**15.1.3**
+## 15.1.3
 
 - gitlab: upgrade CE to v15.1.3
 - gitaly: upgrade to v15.1.3
 
-**15.1.2**
+## 15.1.2
 
 - gitlab: upgrade CE to v15.1.2
 - gitaly: upgrade to v15.1.2
 
-**15.1.1**
+## 15.1.1
 
 - gitlab: upgrade CE to v15.1.1
 - gitaly: upgrade to v15.1.1
 
-**15.1.0**
+## 15.1.0
 
 - gitlab: upgrade CE to v15.1.0
 - gitaly: upgrade to v15.1.0
 - gitlab-shell: upgrade to v14.7.4
 - gitlab-pages: upgrade to v1.59.0
 
-**15.0.3**
+## 15.0.3
 
 - gitlab: upgrade CE to v15.0.3
 - gitaly: upgrade to v15.0.3
 
-**15.0.2**
+## 15.0.2
 
 - gitlab: upgrade CE to v15.0.2
 - gitaly: upgrade to v15.0.2
 - ubuntu: upgrade to focal-20220531
 
-**15.0.1**
+## 15.0.1
 
 - gitlab: upgrade CE to v15.0.1
 - gitaly: upgrade to v15.0.1
 - golang: upgrade to v1.17.11
 
-**15.0.0**
+## 15.0.0
 
 - gitlab: upgrade CE to v15.0.0
 - gitaly: upgrade to v15.0.0
@@ -880,31 +880,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v14.3.0
 - gitlab-pages: upgrade to v1.58.0
 
-**14.10.3**
+## 14.10.3
 
 - gitlab: upgrade CE to v14.10.3
 - gitaly: upgrade to v14.10.3
 
-**14.10.2**
+## 14.10.2
 
 - gitlab: upgrade CE to v14.10.2
 - gitaly: upgrade to v14.10.2
 - ubuntu: upgrade to focal-20220426
 
-**14.10.1**
+## 14.10.1
 
 - gitlab: upgrade CE to v14.10.1
 - gitaly: upgrade to v14.10.1
 - ubuntu: upgrade to focal-20220426
 
-**14.10.0**
+## 14.10.0
 
 - gitlab: upgrade CE to v14.10.0
 - gitaly: upgrade to v14.10.0
 - gitlab-shell: upgrade to v13.25.1
 - ubuntu: upgrade to focal-20220415
 
-**14.9.3**
+## 14.9.3
 
 - gitlab: upgrade CE to v14.9.3
 - gitaly: upgrade to v14.9.3
@@ -912,165 +912,165 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: upgrade to v2.7.6
 - ubuntu: upgrade to focal-20220404
 
-**14.9.2**
+## 14.9.2
 
 - gitlab: upgrade CE to v14.9.2
 - gitaly: upgrade to v14.9.2
 - gitlab-pages: upgrade to v1.56.1
 
-**14.9.1**
+## 14.9.1
 
 - gitlab: upgrade CE to v14.9.1
 - gitaly: upgrade to v14.9.1
 
-**14.9.0**
+## 14.9.0
 
 - gitlab: upgrade CE to v14.9.0
 - gitaly: upgrade to v14.9.0
 - gitlab-pages: upgrade to v1.56.0
 - gitlab-shell: upgrade to v13.24.0
 
-**14.8.4**
+## 14.8.4
 
 - gitlab: upgrade CE to v14.8.4
 - gitaly: upgrade to v14.8.4
 
-**14.8.3**
+## 14.8.3
 
 - gitlab: upgrade CE to v14.8.3
 - gitaly: upgrade to v14.8.3
 - golang: upgrade to v1.17.8
 - ubuntu: upgrade to focal-20220316
 
-**14.8.2**
+## 14.8.2
 
 - gitlab: upgrade CE to v14.8.2
 - gitaly: upgrade to v14.8.2
 
-**14.8.1**
+## 14.8.1
 
 - gitlab: upgrade CE to v14.8.1
 - gitaly: upgrade to v14.8.1
 
-**14.8.0**
+## 14.8.0
 
 - gitlab: upgrade CE to v14.8.0
 - gitaly: upgrade to v14.8.0
 - gitlab-pages: upgrade to v1.54.0
 - gitlab-shell: v13.23.2
 
-**14.7.3**
+## 14.7.3
 
 - gitlab: upgrade CE to v14.7.3
 - gitaly: upgrade to v14.7.3
 - golang: upgrade to v1.17.7
 
-**14.7.2**
+## 14.7.2
 
 - gitlab: upgrade CE to v14.7.2
 - gitaly: upgrade to v14.7.2
 - ubuntu: upgrade to focal-20220113
 
-**14.7.1**
+## 14.7.1
 
 - gitlab: upgrade CE to v14.7.1
 - gitaly: upgrade to v14.7.1
 
-**14.7.0**
+## 14.7.0
 
 - gitlab: upgrade CE to v14.7.0
 - gitaly: upgrade to v14.7.0
 - gitlab-shell: v13.22.2
 - gitlab-pages: upgrade to v1.51.0
 
-**14.6.3**
+## 14.6.3
 
 - gitlab: upgrade CE to v14.6.3
 - gitaly: upgrade to v14.6.3
 
-**14.6.2**
+## 14.6.2
 
 - gitlab: upgrade CE to v14.6.2
 - gitaly: upgrade to v14.6.2
 - golang: upgrade to v1.17.6
 - ubuntu: upgrade to focal-20220105
 
-**14.6.1**
+## 14.6.1
 
 - gitlab: upgrade CE to v14.6.1
 - gitaly: upgrade to v14.6.1
 
-**14.6.0**
+## 14.6.0
 
 - gitlab: upgrade CE to v14.6.0
 - gitaly: upgrade to v14.6.0
 - gitlab-pages: upgrade to v1.49.0
 
-**14.5.2**
+## 14.5.2
 
 - gitlab: upgrade CE to v14.5.2
 - gitaly: upgrade to v14.5.2
 - golang: upgrade to v1.17.5
 
-**14.5.1**
+## 14.5.1
 
 - gitlab: upgrade CE to v14.5.1
 - gitaly: upgrade to v14.5.1
 - gitlab-shell: v13.22.1
 
-**14.5.0**
+## 14.5.0
 
 - gitlab: upgrade CE to v14.5.0
 - gitaly: upgrade to v14.5.0
 - gitlab-pages: upgrade to v1.48.0
 - gitlab-shell: v13.22.0
 
-**14.4.4**
+## 14.4.4
 
 - gitlab: upgrade CE to v14.4.4
 - gitaly: upgrade to v14.4.4
 - ruby: upgrade to v2.7.5
 
-**14.4.3**
+## 14.4.3
 
 - gitlab: upgrade CE to v14.4.3
 - gitaly: upgrade to v14.4.3
 - golang: upgrade to v1.17.4
 
-**14.4.2**
+## 14.4.2
 
 - gitlab: upgrade CE to v14.4.2
 - gitaly: upgrade to v14.4.2
 - redis: upgrade to v6.2.6
 
-**14.4.1**
+## 14.4.1
 
 - gitlab: upgrade CE to v14.4.1
 - gitaly: upgrade to v14.4.1
 
-**14.4.0**
+## 14.4.0
 
 - gitlab: upgrade CE to v14.4.0
 - gitaly: upgrade to v14.4.0
 - gitlab-pages: upgrade to v1.46.0
 
-**14.3.3**
+## 14.3.3
 
 - gitlab: upgrade CE to v14.3.3
 - gitaly: upgrade to v14.3.3
 
-**14.3.2**
+## 14.3.2
 
 - gitlab: upgrade CE to v14.3.2
 - gitaly: upgrade to v14.3.2
 - gitlab-shell: v13.21.1
 
-**14.3.1**
+## 14.3.1
 
 - gitlab: upgrade CE to v14.3.1
 - gitaly: upgrade to v14.3.1
 
-**14.3.0**
+## 14.3.0
 
 - gitlab: upgrade CE to v14.3.0
 - gitaly: upgrade to v14.3.0
@@ -1079,218 +1079,218 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: compile ruby from source and use v2.7.4
 - ubuntu: upgrade to focal-20211006
 
-**14.2.5**
+## 14.2.5
 
 - gitlab: upgrade CE to v14.2.5
 - gitaly: upgrade to v14.2.5
 
-**14.2.4**
+## 14.2.4
 
 - gitlab: upgrade CE to v14.2.4
 - gitaly: upgrade to v14.2.4
 - golang: upgrade to v1.17.1
 
-**14.2.3**
+## 14.2.3
 
 - gitlab: upgrade CE to v14.2.3
 - gitaly: upgrade to v14.2.3
 
-**14.2.2**
+## 14.2.2
 
 - gitlab: upgrade CE to v14.2.2
 - gitaly: upgrade to v14.2.2
 - ubuntu: upgrade to focal-20210827
 
-**14.2.1**
+## 14.2.1
 
 - gitlab: upgrade CE to v14.2.1
 - gitaly: upgrade to v14.2.1
 
-**14.2.0**
+## 14.2.0
 
 - gitlab: upgrade CE to v14.2.0
 - gitaly: upgrade to v14.2.0
 - gitlab-pages: upgrade to v1.42.0
 - golang: upgrade to v1.17
 
-**14.1.3**
+## 14.1.3
 
 - gitlab: upgrade CE to v14.1.3
 - gitaly: upgrade to v14.1.3
 - golang: upgrade to v1.16.7
 
-**14.1.2**
+## 14.1.2
 
 - gitlab: upgrade CE to v14.1.2
 - gitaly: upgrade to v14.1.2
 - gitlab-shell: upgrade to v13.19.1
 
-**14.1.1**
+## 14.1.1
 
 - gitlab: upgrade CE to v14.1.1
 - gitaly: upgrade to v14.1.1
 - ubuntu: upgrade to focal-20210723
 
-**14.1.0**
+## 14.1.0
 
 - gitlab: upgrade CE to v14.1.0
 - gitaly: upgrade to v14.1.0
 
-**14.0.6**
+## 14.0.6
 
 - gitlab: upgrade CE to v14.0.6
 - gitaly: upgrade to v14.0.6
 - golang: upgrade to v1.16.6
 
-**14.0.5**
+## 14.0.5
 
 - gitlab: upgrade CE to v14.0.5
 - gitaly: upgrade to v14.0.5
 
-**14.0.4**
+## 14.0.4
 
 - gitlab: upgrade CE to v14.0.4
 - gitaly: upgrade to v14.0.4
 
-**14.0.3**
+## 14.0.3
 
 - gitlab: upgrade CE to v14.0.3
 - gitaly: upgrade to v14.0.3
 
-**14.0.2**
+## 14.0.2
 
 - gitlab: upgrade CE to v14.0.2
 - gitaly: upgrade to v14.0.2
 
-**14.0.1**
+## 14.0.1
 
 - gitlab: upgrade CE to v14.0.1
 - gitaly: upgrade to v14.0.1
 
-**14.0.0**
+## 14.0.0
 
 - gitlab: upgrade CE to v14.0.0
 - gitaly: upgrade to v14.0.0
 - gitlab-shell: upgrade to v13.19.0
 - gitlab-pages: upgrade to v1.40.0
 
-**13.12.5**
+## 13.12.5
 
 - gitlab: upgrade CE to v13.12.5
 - gitaly: upgrade to v13.12.5
 - ubuntu: upgrade to focal-20210609
 
-**13.12.4**
+## 13.12.4
 
 - gitlab: upgrade CE to v13.12.4
 - gitaly: upgrade to v13.12.4
 
-**13.12.3**
+## 13.12.3
 
 - gitlab: upgrade CE to v13.12.3
 - gitaly: upgrade to v13.12.3
 - golang: upgrade to v1.16.5
 
-**13.12.2**
+## 13.12.2
 
 - gitlab: upgrade CE to v13.12.2
 - gitaly: upgrade to v13.12.2
 
-**13.12.1**
+## 13.12.1
 
 - gitlab: upgrade CE to v13.12.1
 - gitaly: upgrade to v13.12.1
 
-**13.12.0**
+## 13.12.0
 
 - gitlab: upgrade CE to v13.12.0
 - gitlab-shell: upgrade to v13.18.0
 - gitlab-pages: upgrade to v1.39.0
 - gitaly: upgrade to v13.12.0
 
-**13.11.4**
+## 13.11.4
 
 - gitlab: upgrade CE to v13.11.4
 - gitaly: upgrade to v13.11.4
 - golang: upgrade to v1.16.4
 - ubuntu: upgrade to focal-20210416
 
-**13.11.3**
+## 13.11.3
 
 - gitlab: upgrade CE to v13.11.3
 - gitaly: upgrade to v13.11.3
 
-**13.11.2**
+## 13.11.2
 
 - gitlab: upgrade CE to v13.11.2
 - gitaly: upgrade to v13.11.2
 
-**13.11.1**
+## 13.11.1
 
 - gitlab: upgrade CE to v13.11.1
 - gitaly: upgrade to v13.11.1
 
-**13.11.0**
+## 13.11.0
 
 - gitlab: upgrade CE to v13.11.0
 - gitaly: upgrade to v13.11.0
 - gitlab-pages: upgrade to v1.38.0
 - ubuntu: upgrade to focal-20210401
 
-**13.10.3**
+## 13.10.3
 
 - gitlab: upgrade CE to v13.10.3
 - gitaly: upgrade to v13.10.3
 
-**13.10.2**
+## 13.10.2
 
 - gitlab: upgrade CE to v13.10.2
 - gitaly: upgrade to v13.10.2
 - golang: upgrade to v1.16.3
 - ubuntu: upgrade to bionic-20210325
 
-**13.10.1**
+## 13.10.1
 
 - gitlab: upgrade CE to v13.10.1
 - gitaly: upgrade to v13.10.1
 - added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma)
 
-**13.10.0**
+## 13.10.0
 
 - gitlab: upgrade CE to v13.10.0
 - gitaly: upgrade to v13.10.0
 - gitlab-pages: upgrade to v1.36.0
 
-**13.9.5**
+## 13.9.5
 
 - gitlab: upgrade CE to v13.9.5
 - gitaly: upgrade to v13.9.5
 
-**13.9.4**
+## 13.9.4
 
 - gitlab: upgrade CE to v13.9.4
 - gitaly: upgrade to v13.9.4
 - golang: upgrade to v1.16.2
 - ubuntu: upgrade to bionic-20210222
 
-**13.9.3**
+## 13.9.3
 
 - gitlab: upgrade CE to v13.9.3
 - gitaly: upgrade to v13.9.3
 - gitlab-shell: upgrade to v13.17.0
 
-**13.9.2**
+## 13.9.2
 
 - gitlab: upgrade CE to v13.9.2
 - gitaly: upgrade to v13.9.2
 - gitlab-workhorse: upgrade to v8.63.2
 
-**13.9.1**
+## 13.9.1
 
 - gitlab: upgrade CE to v13.9.1
 - gitaly: upgrade to v13.9.1
 
-**13.9.0**
+## 13.9.0
 
 - gitlab: upgrade CE to v13.9.0
 - gitaly: upgrade to v13.9.0
@@ -1299,7 +1299,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-workhorse: upgrade to v8.63.0
 - golang: upgrade to v1.16
 
-**13.8.4**
+## 13.8.4
 
 - added `SSL_PROTOCOLS` option to change protocols of the nginx
 - added `SSL_REGISTRY_CIPHERS`
@@ -1310,23 +1310,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitaly: upgrade to v13.8.4
 - gitlab-shell: upgrade to v13.15.1
 
-**13.8.3**
+## 13.8.3
 
 - gitlab: upgrade CE to v13.8.3
 - gitaly: upgrade to v13.8.3
 - golang: upgrade to v1.15.8
 
-**13.8.2**
+## 13.8.2
 
 - gitlab: upgrade CE to v13.8.2
 - gitaly: upgrade to v13.8.2
 
-**13.8.1**
+## 13.8.1
 
 - gitlab: upgrade CE to v13.8.1
 - gitaly: upgrade to v13.8.1
 
-**13.8.0**
+## 13.8.0
 
 - gitlab: upgrade CE to v13.8.0
 - gitaly: upgrade to v13.8.0
@@ -1336,23 +1336,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - golang: upgrade to v1.15.7
 - ubuntu: upgrade to bionic-20210118
 
-**13.7.4**
+## 13.7.4
 
 - gitlab: upgrade CE to v13.7.4
 
-**13.7.3**
+## 13.7.3
 
 - gitlab: upgrade CE to v13.7.3
 - gitlab-pages: upgrade to v1.34.0
 - gitlab-shell: upgrade to v13.7.3
 - gitlab-workhorse: upgrade to v8.58.2
 
-**13.7.1**
+## 13.7.1
 
 - gitlab: upgrade CE to v13.7.1
 - gitaly: upgrade v13.7.1
 
-**13.7.0**
+## 13.7.0
 
 - gitlab: upgrade CE to v13.7.0
 - gitaly: upgrade v13.7.0
@@ -1362,22 +1362,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ubuntu: upgrade to ubuntu bionic-20201119
 - postgresql: upgrade to postgresql 12
 
-**13.6.3**
+## 13.6.3
 
 - gitlab: upgrade CE to v13.6.3
 - gitaly: upgrade v13.6.3
 
-**13.6.2**
+## 13.6.2
 
 - gitlab: upgrade CE to v13.6.2
 - gitaly: upgrade v13.6.2
 
-**13.6.1**
+## 13.6.1
 
 - gitlab: upgrade CE to v13.6.1
 - gitaly: upgrade v13.6.1
 
-**13.6.0**
+## 13.6.0
 
 - gitlab: upgrade CE to v13.6.0
 - gitaly: upgrade v13.6.0
@@ -1387,22 +1387,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - use bundler 2.1.4
 - use ruby 2.7
 
-**13.5.4**
+## 13.5.4
 
 - gitlab: upgrade CE to v13.5.4
 - gitaly: upgrade v13.5.4
 
-**13.5.3**
+## 13.5.3
 
 - gitlab: upgrade CE to v13.5.3
 - gitaly: upgrade v13.5.3
 
-**13.5.2**
+## 13.5.2
 
 - gitlab: upgrade CE to v13.5.2
 - gitaly: upgrade v13.5.2
 
-**13.5.1**
+## 13.5.1
 
 - gitlab: upgrade CE to v13.5.1
 - gitaly: upgrade v13.5.1
@@ -1410,17 +1410,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-pages: upgrade to v1.28.0
 - gitlab-workhorse: upgrade to v8.51.0
 
-**13.4.4**
+## 13.4.4
 
 - gitlab: upgrade CE to v13.4.4
 - gitaly: upgrade to v13.4.4
 
-**13.4.3**
+## 13.4.3
 
 - gitlab: upgrade CE to v13.4.3
 - gitaly: upgrade to v13.4.3
 
-**13.4.2**
+## 13.4.2
 
 - gitlab: upgrade CE to v13.4.2
 - gitaly: upgrade to v13.4.2
@@ -1429,17 +1429,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: uprade to 13.7.0
 - ubuntu: upgrade to bionic-20200921
 
-**13.3.4**
+## 13.3.4
 
 - gitlab: upgrade CE to v13.3.4
 - gitaly: upgrade to v13.3.4
 
-**13.3.1**
+## 13.3.1
 
 - gitlab: upgrade CE to v13.3.1
 - gitaly: upgrade to v13.3.1
 
-**13.3.0**
+## 13.3.0
 
 - gitlab: upgrade CE to v13.3.0
 - gitaly: upgrade to v13.3.0
@@ -1447,90 +1447,90 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab-shell: upgrade to v13.6.0
 - gitlab-workhorse: upgrade to v8.39.0
 
-**13.2.6**
+## 13.2.6
 
 - gitlab: upgrade CE to v13.2.6
 
-**13.2.4**
+## 13.2.4
 
 - gitlab: upgrade CE to v13.2.4
 - ubuntu: upgrade to bionic-20200713
 
-**13.2.3**
+## 13.2.3
 
 - gitlab: upgrade CE to v13.2.3
 - golang: upgrade to 1.14.7
 - gitaly: upgrade to 13.2.3
 - postgresql: add btree_gist extension
 
-**13.2.2**
+## 13.2.2
 
 - gitlab: upgrade CE to v13.2.2
 
-**13.2.1**
+## 13.2.1
 
 - gitlab: upgrade CE to v13.2.1
 
-**13.0.7**
+## 13.0.7
 
 - gitlab: upgrade CE to v13.0.7
 
-**13.0.6**
+## 13.0.6
 
 - gitlab: upgrade CE to v13.0.6
 
-**13.0.5**
+## 13.0.5
 
 - gitlab: upgrade CE to v13.0.5
 
-**13.0.3**
+## 13.0.3
 
 - gitlab: upgrade CE to v13.0.3
 
-**13.0.2**
+## 13.0.2
 
 - gitlab: upgrade CE to v13.0.2
 
-**13.0.1**
+## 13.0.1
 
 - gitlab: upgrade CE to v13.0.1
 
-**13.0.0**
+## 13.0.0
 
 - gitlab: upgrade CE to v13.0.0
 
-**12.10.6**
+## 12.10.6
 
 - gitlab: upgrade CE to v12.10.6
 
-**12.10.4**
+## 12.10.4
 
 - updated to ubuntu:bionic-20200403
 - gitlab-workhorse: update to 8.30.1
 - sync: upstream configs
 - gitlab: upgrade to 12.10.4
 
-**12.9.5**
+## 12.9.5
 
 - gitlab: updated to 12.9.5
 - gitlab-shell: updated to 12.2.0
 - gitaly: updated to 12.10.0
 
-**12.9.4**
+## 12.9.4
 
 - gitlab: upgrade CE to v12.9.4
 - Update gitlab-workhorse to 8.25.2
 - Update golang to 1.13.10
 
-**12.9.2**
+## 12.9.2
 
 - gitlab: upgrade CE to v12.9.2
 
-**12.9.1**
+## 12.9.1
 
 - gitlab: upgrade CE to v12.9.1
 
-**12.9.0**
+## 12.9.0
 
 - gitlab: upgrade CE to v12.9.0
 - replaced unicorn with puma
@@ -1541,65 +1541,61 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `PUMA_WORKERS`
 - Added `PUMA_TIMEOUT`
 
-**12.8.8**
+## 12.8.8
 
 - gitlab: upgrade CE to v12.8.8
 
-**12.8.7**
+## 12.8.7
 
 - gitlab: upgrade CE to v12.8.7
 
-**12.8.6**
+## 12.8.6
 
 - gitlab: upgrade CE to v12.8.6
 
-**12.8.5**
+## 12.8.5
 
 - gitlab: upgrade CE to v12.8.5
 
-**12.8.4**
+## 12.8.4
 
 - gitlab: upgrade CE to v12.8.4
 
-**12.8.3**
+## 12.8.3
 
 - gitlab: upgrade CE to v12.8.3
 
-**12.8.2**
+## 12.8.2
 
 - gitlab: upgrade CE to v12.8.2
 
-**12.8.1**
+## 12.8.1
 
 - gitlab: upgrade CE to v12.8.1
 
-**12.8.0**
+## 12.8.0
 
 - gitlab: upgrade CE to v12.8.0
 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
 
-**12.7.8**
+## 12.7.8
 
 - Upgrade GitLab CE to 12.7.8
 
-**12.7.7**
+## 12.7.7
 
 - Upgrade GitLab CE to 12.7.7
 - Add Generic OAuth Provider PR#2070
 
-**12.7.7**
-
-- Upgrade GitLab CE to 12.7.7
-
-**12.7.6**
+## 12.7.6
 
 - gitlab: upgrade CE to v12.7.6
 
-**12.7.5**
+## 12.7.5
 
 - gitlab: upgrade CE to v12.7.5
 
-**12.7.4**
+## 12.7.4
 
 - Upgrade GitLab CE to 12.7.4
 - Update golang to 1.13.7
@@ -1607,11 +1603,11 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Update gitlab-workhorse to 8.20.0
 - Update gitaly to 1.85.0
 
-**12.7.2**
+## 12.7.2
 
 - Upgrade GitLab CE to 12.7.2
 
-**12.7.0**
+## 12.7.0
 
 - Update gitlab-shell to 11.0.0
 - Upgrade GitLab CE to 12.7.0
@@ -1620,162 +1616,162 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Update gitlab-pages to 1.14.0
 - Update gitlab-workhorse to 8.19.0
 
-**12.6.4**
+## 12.6.4
 
 - gitlab: upgrade CE to v12.6.4
 
-**12.6.3**
+## 12.6.3
 
 - gitlab: upgrade CE to v12.6.3
 
-**12.6.2**
+## 12.6.2
 
 - gitlab: upgrade CE to v12.6.2
 
-**12.6.1**
+## 12.6.1
 
 - gitlab: upgrade CE to v12.6.1
 
-**12.6.0**
+## 12.6.0
 
 - gitlab: upgrade CE to v12.6.0
 
-**12.5.7**
+## 12.5.7
 
 - gitlab: upgrade CE to v12.5.7
 
-**12.5.6**
+## 12.5.6
 
 - gitlab: upgrade CE to v12.5.6
 
-**12.5.5**
+## 12.5.5
 
 - gitlab: upgrade CE to v12.5.5
 
-**12.5.4**
+## 12.5.4
 
 - gitlab: upgrade CE to v12.5.4
 - Update golang to 1.12.14
 
-**12.5.3**
+## 12.5.3
 
 - gitlab: upgrade CE to v12.5.3
 
-**12.5.2**
+## 12.5.2
 
 - gitlab: upgrade CE to v12.5.2
 
-**12.5.1**
+## 12.5.1
 
 - gitlab: upgrade CE to v12.5.1
 
-**12.5.0**
+## 12.5.0
 
 - gitlab: upgrade CE to v12.5.0
 
-**12.4.3**
+## 12.4.3
 
 - gitlab: upgrade CE to v12.4.3
 
-**12.4.2**
+## 12.4.2
 
 - gitlab: upgrade CE to v12.4.2
 
-**12.4.1**
+## 12.4.1
 
 - gitlab: upgrade CE to v12.4.1
 
-**12.4.0**
+## 12.4.0
 
 - gitlab: upgrade CE to v12.4.0
 
-**12.3.5**
+## 12.3.5
 
 - gitlab: upgrade CE to v12.3.5
 
-**12.3.4**
+## 12.3.4
 
 - gitlab: upgrade CE to v12.3.4
 
-**12.3.3**
+## 12.3.3
 
 - gitlab: upgrade CE to v12.3.3
 
-**12.3.2**
+## 12.3.2
 
 - gitlab: upgrade CE to v12.3.2
 
-**12.3.1**
+## 12.3.1
 
 - gitlab: upgrade CE to v12.3.1
 
-**12.3.0**
+## 12.3.0
 
 - gitlab: upgrade CE to v12.3.0
 
-**12.2.5**
+## 12.2.5
 
 - gitlab: upgrade CE to v12.2.5
 
-**12.2.4**
+## 12.2.4
 
 - gitlab: upgrade CE to v12.2.4
 
-**12.2.3**
+## 12.2.3
 
 - gitlab: upgrade CE to v12.2.3
 
-**12.2.1**
+## 12.2.1
 
 - gitlab: upgrade CE to v12.2.1
 
-**12.2.0**
+## 12.2.0
 
 - gitlab: upgrade CE to v12.2.0
 - upgrade base image to ubuntu:bionic
 
-**12.1.6**
+## 12.1.6
 
 - gitlab: upgrade CE to v12.1.6
 
-**12.1.4**
+## 12.1.4
 
 - gitlab: upgrade CE to v12.1.4
 
-**12.1.3**
+## 12.1.3
 
 - gitlab: upgrade CE to v12.1.3
 
-**12.1.2**
+## 12.1.2
 
 - gitlab: upgrade CE to v12.1.2
 
-**12.1.1**
+## 12.1.1
 
 - gitlab: upgrade CE to v12.1.1
 
-**12.1.0**
+## 12.1.0
 
 - gitlab: upgrade CE to v12.1.0
 - Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html)
 
-**12.0.4**
+## 12.0.4
 
 - gitlab: upgrade CE to v12.0.4
 
-**12.0.3**
+## 12.0.3
 
 - gitlab: upgrade CE to v12.0.3
 
-**12.0.2**
+## 12.0.2
 
 - gitlab: upgrade CE to v12.0.2
 
-**12.0.1**
+## 12.0.1
 
 - gitlab: upgrade CE to v12.0.1
 
-**12.0.0**
+## 12.0.0
 
 - gitlab: upgrade CE to v12.0.0
 - Update gitaly to 1.47.0
@@ -1784,134 +1780,134 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ruby: update to 2.6
 - python: update to 3
 
-**11.11.3**
+## 11.11.3
 
 - gitlab: upgrade CE to v11.11.3
 - Update gitaly to 1.42.4
 - Update golang to 1.12.6
 
-**11.11.2**
+## 11.11.2
 
 - gitlab: upgrade CE to v11.11.2
 - Update gitaly to 1.42.3
 
-**11.11.1**
+## 11.11.1
 
 - gitlab: upgrade CE to v11.11.1
 - Update gitaly to 1.42.2
 
-**11.11.0**
+## 11.11.0
 
 - gitlab: upgrade CE to v11.11.0
 - Update gitaly to 1.42.0
 - Update gitlab-shell to 9.1.0
 - Update gitlab-workhorse to 8.7.0
 
-**11.10.4**
+## 11.10.4
 
 - gitlab: upgrade CE to v11.10.4
 
-**11.10.3**
+## 11.10.3
 
 - gitlab: upgrade CE to v11.10.3
 
-**11.10.2**
+## 11.10.2
 
 - gitlab: upgrade CE to v11.10.2
 
-**11.10.1**
+## 11.10.1
 
 - gitlab: upgrade CE to v11.10.1
 
-**11.10.0**
+## 11.10.0
 
 - gitlab: upgrade CE to v11.10.0
 
-**11.9.8**
+## 11.9.8
 
 - gitlab: upgrade CE to v11.9.8
 
-**11.9.7**
+## 11.9.7
 
 - gitlab: upgrade CE to v11.9.7
 
-**11.9.6**
+## 11.9.6
 
 - gitlab: upgrade CE to v11.9.6
 
-**11.9.5**
+## 11.9.5
 
 - gitlab: upgrade CE to v11.9.5
 
-**11.9.4**
+## 11.9.4
 
 - gitlab: upgrade CE to v11.9.4
 - Update gitlab-workhorse to 8.3.3
 
-**11.9.1**
+## 11.9.1
 
 - gitlab: upgrade CE to v11.9.1
 - Update gitaly to 1.27.1
 
-**11.9.0**
+## 11.9.0
 
 - gitlab: upgrade CE to v11.9.0
 
-**11.8.3**
+## 11.8.3
 
 - gitlab: upgrade CE to v11.8.3
 
-**11.8.2**
+## 11.8.2
 
 - gitlab: upgrade CE to v11.8.2
 
-**11.8.1**
+## 11.8.1
 
 - gitlab: upgrade CE to v11.8.1
 
-**11.8.0**
+## 11.8.0
 
 - gitlab: upgrade CE to v11.8.0
 - Update gitlab-workhorse to 8.3.1
 - Update gitaly to 1.20.0
 - Update gitlab-pages to 1.5.0
 
-**11.7.5**
+## 11.7.5
 
 - gitlab: upgrade CE to v11.7.5
 
-**11.7.4**
+## 11.7.4
 
 - gitlab: upgrade CE to v11.7.4
 
-**11.7.3**
+## 11.7.3
 
 - gitlab: upgrade CE to v11.7.3
 - Update gitlab-workhorse to 8.1.1
 - Update gitaly to 1.13.0
 - Update gitlab-pages to 1.4.0
 
-**11.7.0**
+## 11.7.0
 
 - gitlab: upgrade CE to v11.7.0
 
-**11.6.5**
+## 11.6.5
 
 - gitlab: upgrade CE to v11.6.5
 
-**11.6.4**
+## 11.6.4
 
 - gitlab: upgrade CE to v11.6.4
 
-**11.6.3**
+## 11.6.3
 
 - gitlab: upgrade CE to v11.6.3
 
-**11.6.2**
+## 11.6.2
 
 - gitlab: upgrade CE to v11.6.2
 
-**11.6.1**
+## 11.6.1
 
 - gitlab: upgrade CE to v11.6.1
 - Added `GITLAB_IMPERSONATION_ENABLED`
@@ -1922,7 +1918,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_PAGES_ACCESS_SECRET`
 - Added `GITLAB_PAGES_ACCESS_REDIRECT_URI`
 
-**11.6.0**
+## 11.6.0
 
 - gitlab: upgrade CE to v11.6.0
 - Update gitaly to 1.7.1
@@ -1938,203 +1934,203 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Added `GITLAB_BACKUP_DIR_GROUP`
 - Added `GITLAB_PAGES_NGINX_PROXY`
 
-**11.5.5**
+## 11.5.5
 
 - gitlab: upgrade CE to v11.5.5
 
-**11.5.4**
+## 11.5.4
 
 - gitlab: upgrade CE to v11.5.4
 
-**11.5.3**
+## 11.5.3
 
 - gitlab: upgrade CE to v11.5.3
 
-**11.5.2**
+## 11.5.2
 
 - gitlab: upgrade CE to v11.5.2
 
-**11.5.1-1**
+## 11.5.1-1
 
 - Fixed GitLab Dependencies
 
-**11.5.1**
+## 11.5.1
 
 - gitlab: upgrade CE to v11.5.1
 
-**11.5.0**
+## 11.5.0
 
 - gitlab: upgrade CE to v11.5.0
 
-**11.4.7**
+## 11.4.7
 
 - gitlab: upgrade CE to v11.4.7
 
-**11.4.6**
+## 11.4.6
 
 - gitlab: upgrade CE to v11.4.6
 
-**11.4.5**
+## 11.4.5
 
 - gitlab: upgrade CE to v11.4.5
 
-**11.4.4**
+## 11.4.4
 
 - gitlab: upgrade CE to v11.4.4
 - golang: update to 1.10.4
 
-**11.4.3**
+## 11.4.3
 
 - gitlab: upgrade CE to v11.4.3
 
-**11.4.2**
+## 11.4.2
 
 - gitlab: upgrade CE to v11.4.2
 
-**11.4.1**
+## 11.4.1
 
 - gitlab: upgrade CE to v11.4.1
 - Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731)
 
-**11.4.0**
+## 11.4.0
 
 - gitlab: upgrade CE to v11.4.0
 - baseimage: upgrade to xenial-20181005
 
-**11.3.6**
+## 11.3.6
 
 - gitlab: upgrade CE to v11.3.6
 
-**11.3.5**
+## 11.3.5
 
 - gitlab: upgrade CE to v11.3.5
 
-**11.3.4**
+## 11.3.4
 
 - gitlab: upgrade CE to v11.3.4
 
-**11.3.3**
+## 11.3.3
 
 - gitlab: upgrade CE to v11.3.3
 
-**11.3.2**
+## 11.3.2
 
 - gitlab: upgrade CE to v11.3.2
 
-**11.3.1**
+## 11.3.1
 
 - gitlab: upgrade CE to v11.3.1
 
-**11.3.0**
+## 11.3.0
 
 - gitlab: upgrade CE to v11.3.0
 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725)
 - Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699)
 - Fix gitlay-ssh symlink to enable rebase/squash in forks
 
-**11.2.3**
+## 11.2.3
 
 - gitlab: upgrade CE to v11.2.3
 
-**11.2.2**
+## 11.2.2
 
 - gitlab: upgrade CE to v11.2.2
 
-**11.2.1**
+## 11.2.1
 
 - gitlab: upgrade CE to v11.2.1
 
-**11.2.0**
+## 11.2.0
 
 - gitlab: upgrade CE to v11.2.0
 - ADD `GITLAB_DEFAULT_THEME`
 
-**11.1.4**
+## 11.1.4
 
 - gitlab: upgrade CE to v11.1.4
 
-**11.1.3**
+## 11.1.3
 
 - gitlab: upgrade CE to v11.1.3
 - Upgrade redis to 4.0.9-1
 
-**11.1.2**
+## 11.1.2
 
 - gitlab: upgrade CE to v11.1.2
 
-**11.1.1**
+## 11.1.1
 
 - gitlab: upgrade CE to v11.1.1
 
-**11.1.0**
+## 11.1.0
 
 - gitlab: upgrade CE to v11.1.0
 
-**11.0.4**
+## 11.0.4
 
 - gitlab: upgrade CE to v11.0.4
 
-**11.0.3**
+## 11.0.3
 
 - gitlab: upgrade CE to v11.0.3
 - ruby: update to 2.4
 
-**11.0.2**
+## 11.0.2
 
 - gitlab: upgrade CE to v11.0.2
 
-**11.0.1**
+## 11.0.1
 
 - gitlab: upgrade CE to v11.0.1
 
-**11.0.0**
+## 11.0.0
 
 - gitlab: upgrade CE to v11.0.0
 
-**10.8.4**
+## 10.8.4
 
 - gitlab: upgrade CE to v10.8.4
 
-**10.8.3-1**
+## 10.8.3-1
 
 - Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628)
 
-**10.8.3**
+## 10.8.3
 
 - gitlab: upgrade CE to v10.8.3
 - Fix potential boot problems on clean setups [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621)
 
-**10.8.2**
+## 10.8.2
 
 - gitlab: upgrade CE to v10.8.2
 
-**10.8.1**
+## 10.8.1
 
 - gitlab: upgrade CE to v10.8.1
 
-**10.8.0**
+## 10.8.0
 
 - gitlab: upgrade CE to v10.8.0
 - Add support for swarm mode with docker-configs and docker secrets ([#1540](https://github.com/sameersbn/docker-gitlab/pull/1540))
 
-**10.7.4**
+## 10.7.4
 
 - gitlab: upgrade CE to v10.7.4
 - FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 
-**10.7.3**
+## 10.7.3
 
 - gitlab: upgrade CE to v10.7.3
 
-**10.7.2**
+## 10.7.2
 
 - gitlab: upgrade CE to v10.7.2
 
-**10.7.1**
+## 10.7.1
 
 - gitlab: upgrade CE to v10.7.1
 
-**10.7.0**
+## 10.7.0
 
 - gitlab: upgrade CE to v10.7.0
 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT`
@@ -2176,98 +2172,98 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT`
 - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE`
 
-**10.6.4**
+## 10.6.4
 
 - gitlab: upgrade CE to v10.6.4
 
-**10.6.3**
+## 10.6.3
 
 - gitlab: upgrade CE to v10.6.3
 
-**10.6.2**
+## 10.6.2
 
 - gitlab: upgrade CE to v10.6.2
 - golang: update to 1.9.5
 
-**10.6.1**
+## 10.6.1
 
 - gitlab: upgrade CE to v10.6.1
 
-**10.6.0**
+## 10.6.0
 
 - gitlab: upgrade CE to v10.6.0
 
-**10.5.6**
+## 10.5.6
 
 - gitlab: security upgrade CE to v10.5.6
 
-**10.5.5**
+## 10.5.5
 
 - gitlab: upgrade CE to v10.5.5
 
-**10.5.4**
+## 10.5.4
 
 - gitlab: upgrade CE to v10.5.4
 
-**10.5.3**
+## 10.5.3
 
 - gitlab: upgrade CE to v10.5.3
 
-**10.5.2**
+## 10.5.2
 
 - gitlab: upgrade CE to v10.5.2
 - Fix `GITLAB_UPLOADS_STORAGE_PATH`
 
-**10.5.1**
+## 10.5.1
 
 - gitlab: upgrade CE to v10.5.1
 
-**10.5.0**
+## 10.5.0
 
 - gitlab: upgrade CE to v10.5.0
 - Add `GITLAB_UPLOADS_STORAGE_PATH`
 - Add `GITLAB_UPLOADS_BASE_DIR`
 - Add `LDAP_LOWERCASE_USERNAMES`
 
-**10.4.4**
+## 10.4.4
 
 - gitlab: upgrade CE to v10.4.4
 
-**10.4.3**
+## 10.4.3
 
 - gitlab: upgrade CE to v10.4.3
 
-**10.4.2-1**
+## 10.4.2-1
 
 - FIXED SSH Host Key generation through dropping the support for rsa1
 
-**10.4.2**
+## 10.4.2
 
 - gitlab: upgrade CE to v10.4.2
 
-**10.4.1**
+## 10.4.1
 
 - gitlab: upgrade CE to v10.4.1
 
-**10.4.0**
+## 10.4.0
 
 - gitlab: upgrade CE to v10.4.0
 - docker: upgrade to ubuntu xenial as baseimage
 - golang: update to 1.9.3
 
-**10.3.6**
+## 10.3.6
 
 - gitlab: upgrade CE to v10.3.6
 
-**10.3.5**
+## 10.3.5
 
 - gitlab: upgrade CE to v10.3.5
 
-**10.3.4**
+## 10.3.4
 
 - gitlab: upgrade CE to v10.3.4
 
-**10.3.3**
+## 10.3.3
 
 - gitlab: upgrade CE to v10.3.3
 - ADDED `AWS_BACKUP_ENCRYPTION` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
@@ -2275,15 +2271,15 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - FIXED `AWS_BACKUP_MULTIPART_CHUNK_SIZE` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/)
 - Apply PaX mark to ruby [1458](https://github.com/sameersbn/docker-gitlab/pull/1458)
 
-**10.3.2**
+## 10.3.2
 
 - gitlab: upgrade CE to v10.3.2
 
-**10.3.1**
+## 10.3.1
 
 - gitlab: upgrade CE to v10.3.1
 
-**10.3.0**
+## 10.3.0
 
 - gitlab: upgrade CE to v10.3.0
 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD`
@@ -2293,169 +2289,169 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - REMOVED `GITLAB_MAX_OBJECT_SIZE`
 - REMOVED `GITLAB_TIMEOUT`
 
-**10.2.5**
+## 10.2.5
 
 - gitlab: upgrade CE to v10.2.5
 
-**10.2.4**
+## 10.2.4
 
 - gitlab: upgrade to CE v10.2.4
 
-**10.2.3**
+## 10.2.3
 
 - gitlab: upgrade to CE v10.2.3
 
-**10.2.2**
+## 10.2.2
 
 - gitlab: upgrade to CE v10.2.2
 
-**10.2.1**
+## 10.2.1
 
 - gitlab: upgrade to CE v10.2.1
 
-**10.2.0**
+## 10.2.0
 
 - gitlab: upgrade to CE v10.2.0
 
-**10.1.4**
+## 10.1.4
 
 - gitlab: upgrade to CE v10.1.4
 
-**10.1.3**
+## 10.1.3
 
 - gitlab: upgrade to CE v10.1.3
 
-**10.1.2**
+## 10.1.2
 
 - gitlab: upgrade to CE v10.1.2
 
-**10.1.1**
+## 10.1.1
 
 - gitlab: upgrade to CE v10.1.1
 
-**10.1.0**
+## 10.1.0
 
 - gitlab: upgrade to CE v10.1.0
 - REMOVED `GITALY_ENABLED``
 - ADDED `GITALY_ARTIFACTS_SERVER`
 - ADDED `GITALY_CLIENT_PATH`
 
-**10.0.4**
+## 10.0.4
 
 - gitlab: upgrade to CE v10.0.4
 
-**10.0.3**
+## 10.0.3
 
 - gitlab: upgrade to CE v10.0.3
 
-**10.0.2**
+## 10.0.2
 
 - gitlab: upgrade to CE v10.0.2
 
-**10.0.1**
+## 10.0.1
 
 - gitlab: upgrade to CE v10.0.1
 
-**10.0.0**
+## 10.0.0
 
 - gitlab: upgrade to CE v10.0.0
 
-**9.5.5**
+## 9.5.5
 
 - gitlab: upgrade to CE v9.5.5
 
-**9.5.4**
+## 9.5.4
 
 - gitlab: upgrade to CE v9.5.4
 
-**9.5.3**
+## 9.5.3
 
 - gitlab: upgrade to CE v9.5.3
 
-**9.5.2**
+## 9.5.2
 
 - gitlab: upgrade to CE v9.5.2
 
-**9.5.1**
+## 9.5.1
 
 - gitlab: upgrade to CE v9.5.1
 
-**9.5.0**
+## 9.5.0
 
 - gitlab: upgrade to CE v9.5.0
 
-**9.4.5**
+## 9.4.5
 
 - gitlab: upgrade to CE v9.4.5
 
-**9.4.4**
+## 9.4.4
 
 - gitlab: upgrade to CE v9.4.4
 
-**9.4.3**
+## 9.4.3
 
 - gitlab: upgrade to CE v9.4.3
 
-**9.4.2**
+## 9.4.2
 
 - gitlab: upgrade to CE v9.4.2
 
-**9.4.1**
+## 9.4.1
 
 - gitlab: upgrade to CE v9.4.1
 
-**9.4.0-1**
+## 9.4.0-1
 
 - Fix asset compiling for missing translations
 
-**9.4.0**
+## 9.4.0
 
 - gitlab: upgrade to CE v9.4.0
 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137))
 - Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288))
 
-**9.3.9**
+## 9.3.9
 
 - gitlab: upgrade to CE v9.3.9
 
-**9.3.8**
+## 9.3.8
 
 - gitlab: upgrade to CE v9.3.8
 - Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
 
-**9.3.7**
+## 9.3.7
 
 - gitlab: upgrade to CE v9.3.7
 
-**9.3.6**
+## 9.3.6
 
 - gitlab: upgrade to CE v9.3.6
 
-**9.3.5**
+## 9.3.5
 
 - gitlab: upgrade to CE v9.3.5
 
-**9.3.4**
+## 9.3.4
 
 - gitlab: upgrade to CE v9.3.4
 
-**9.3.3**
+## 9.3.3
 
 - gitlab: upgrade to CE v9.3.3
 
-**9.3.2**
+## 9.3.2
 
 - gitlab: upgrade to CE v9.3.2
 
-**9.3.1**
+## 9.3.1
 
 - gitlab: upgrade to CE v9.3.1
 
-**9.3.0-1**
+## 9.3.0-1
 
 - Add the missing Gitaly config to let git commands over http/https working
 
-**9.3.0**
+## 9.3.0
 
 - gitlab: upgrade to CE v9.3.0
 - update baseimage to `14.04.20170608`
@@ -2465,108 +2461,108 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - Add `GITALY_SOCKET_PATH`
 - Add `GITALY_ADDRESS`
 
-**9.2.7**
+## 9.2.7
 
 - gitlab: upgrade to CE v9.2.7
 
-**9.2.6**
+## 9.2.6
 
 - gitlab: upgrade to CE v9.2.6
 
-**9.2.5**
+## 9.2.5
 
 - gitlab: upgrade to CE v9.2.5
 
-**9.2.2**
+## 9.2.2
 
 - gitlab: upgrade to CE v9.2.2
 
-**9.2.1**
+## 9.2.1
 
 - gitlab: upgrade to CE v9.2.1
 
-**9.2.0**
+## 9.2.0
 
 - gitlab: upgrade to CE v9.2.0
 - Add flexibility to use versions committed into gitlab-ce
 
-**9.1.4**
+## 9.1.4
 
 - gitlab: upgrade to CE v9.1.4
 
-**9.1.3**
+## 9.1.3
 
 - gitlab: upgrade to CE v9.1.3
 
-**9.1.2**
+## 9.1.2
 
 - gitlab: upgrade to CE v9.1.2
 - update baseimage to `14.04.20170503`
 
-**9.1.1**
+## 9.1.1
 
 - gitlab: upgrade to CE v9.1.1
 
-**9.1.0-1**
+## 9.1.0-1
 
 - Fix gitlab-workhorse version display
 
-**9.1.0**
+## 9.1.0
 
 - gitlab: upgrade to CE v9.1.0
 - gitlab-shell: upgrade to 5.0.2
 - gitlab-workhorse: upgrade to 1.4.3
 
-**9.0.6**
+## 9.0.6
 
 - gitlab: upgrade to CE v9.0.6
 
-**9.0.5**
+## 9.0.5
 
 - gitlab: upgrade to CE v9.0.5
 
-**9.0.4**
+## 9.0.4
 
 - gitlab: upgrade to CE v9.0.4
 
-**9.0.3**
+## 9.0.3
 
 - gitlab: upgrade to CE v9.0.3
 
-**9.0.2**
+## 9.0.2
 
 - gitlab: upgrade to CE v9.0.2
 
-**9.0.1**
+## 9.0.1
 
 - gitlab: upgrade to CE v9.0.1
 - gitlab-workhorse 1.4.2
 
-**9.0.0**
+## 9.0.0
 
 - gitlab: upgrade to CE v9.0.0
 - gitlab-shell 5.0.0
 - gitlab-workhorse 1.4.1
 - gitlab-pages 0.4.0
 
-**8.17.4**
+## 8.17.4
 
 - gitlab: upgrade to CE v8.17.4
 
-**8.17.3**
+## 8.17.3
 
 - gitlab: upgrade to CE v8.17.3
 
-**8.17.2**
+## 8.17.2
 
 - gitlab: upgrade to CE v8.17.2
 
-**8.17.1**
+## 8.17.1
 
 - gitlab: upgrade to CE v8.17.1
 - fixes first problems with gitlab-pages
 
-**8.17.0**
+## 8.17.0
 
 - gitlab: upgrade to CE v8.17.0
 - added `GITLAB_PAGES_ENABLED`
@@ -2581,52 +2577,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added nodejs 7.x as core dependencies
 - added gitlab-pages daemon
 
-**8.16.6**
+## 8.16.6
 
 - gitlab: upgrade to CE v8.16.6
 - Fix logical bug of Remote Backup
 
-**8.16.5**
+## 8.16.5
 
 - gitlab: upgrade to CE v8.16.5
 
-**8.16.4**
+## 8.16.4
 
 - gitlab: upgrade to CE v8.16.4
 
-**8.16.3**
+## 8.16.3
 
 - gitlab: upgrade to CE v8.16.3
 
-**8.16.2**
+## 8.16.2
 
 - gitlab: upgrade to CE v8.16.2
 
-**8.16.1**
+## 8.16.1
 
 - gitlab: upgrade to CE v8.16.1
 
-**8.16.0**
+## 8.16.0
 
 - gitlab: upgrade to CE v8.16.0
 
-**8.15.4**
+## 8.15.4
 
 - gitlab: upgrade to CE v8.15.4
 
-**8.15.3**
+## 8.15.3
 
 - gitlab: upgrade to CE v8.15.3
 
-**8.15.2**
+## 8.15.2
 
 - gitlab: upgrade to CE v8.15.2
 
-**8.15.1**
+## 8.15.1
 
 - gitlab: upgrade to CE v8.15.1
 
-**8.15.0**
+## 8.15.0
 
 - gitlab: upgrade to CE v8.15.0
 - added `GITLAB_MATTERMOST_ENABLED`
@@ -2636,245 +2632,244 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - added `OAUTH_AUTHENTIQ_SCOPE`
 - added `OAUTH_AUTHENTIQ_REDIRECT_URI`
 
-**8.14.5**
+## 8.14.5
 
 - gitlab: upgrade to CE v8.14.5
 
-**8.14.4**
+## 8.14.4
 
 - gitlab: upgrade to CE v8.14.4
 
-**8.14.3**
+## 8.14.3
 
 - gitlab: upgrade to CE v8.14.3
 
-**8.14.2**
+## 8.14.2
 
 - gitlab: upgrade to CE v8.14.2
 
-**8.14.1**
+## 8.14.1
 
 - gitlab: upgrade to CE v8.14.1
 
-**8.14.0**
+## 8.14.0
 
 - gitlab: upgrade to CE v8.14.0
 - added `IMAP_TIMEOUT`
 - update golang to 1.6.3
 
-**8.13.6**
+## 8.13.6
 
 - gitlab: upgrade to CE v8.13.6
 
-**8.13.5**
+## 8.13.5
 
 - gitlab: upgrade to CE v8.13.5
 
-**Important**:
-We skipped `8.13.4` because it doesn't contain any changes. For more
-information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/)
+## 8.13.4
 
-**8.12.1**
+**Important:** We skipped `8.13.4` because it doesn't contain any changes. For more information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/).
 
-**8.13.3**
+## 8.13.3
 
 - gitlab: upgrade to CE v8.13.3
 
-**8.13.2**
+## 8.13.2
 
 - gitlab: upgrade to CE v8.13.2
 
-**8.13.1**
+## 8.13.1
 
 - gitlab: upgrade to CE v8.13.1
 
-**8.13.0**
+## 8.13.0
 
 - gitlab: upgrade to CE v8.13.0
 - added `GITLAB_EMAIL_SUBJECT_SUFFIX`
 
-**8.12.7**
+## 8.12.7
 
 - gitlab: upgrade to CE v8.12.7
 
-**8.12.6**
+## 8.12.6
 
 - gitlab: upgrade to CE v8.12.6
 
-**8.12.5**
+## 8.12.5
 
 - gitlab: upgrade to CE v8.12.5
 
-**8.12.4**
+## 8.12.4
 
 - gitlab: upgrade to CE v8.12.4
 
-**8.12.3**
+## 8.12.3
 
 - gitlab: upgrade to CE v8.12.3
 
-**Important**:
-We skipped `8.12.2` because it doesn't contain any changes. For more
-information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/)
+## 8.12.2
 
-**8.12.1**
+**Important:** We skipped `8.12.2` because it doesn't contain any changes. For more information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/).
+
+## 8.12.1
 
 - gitlab: upgrade to CE v8.12.1
 
-**8.12.0**
+## 8.12.0
 
 - gitlab: upgrade to CE v8.12.0
 
-**8.11.7**
+## 8.11.7
 
 - gitlab: upgrade to CE v8.11.7
 
-**8.11.6**
+## 8.11.6
 
 - gitlab: upgrade to CE v8.11.6
 
-**8.11.5**
+## 8.11.5
 
 - gitlab: upgrade to CE v8.11.5
 
-**8.11.4**
+## 8.11.4
 
 - gitlab: upgrade to CE v8.11.4
 
-**8.11.3**
+## 8.11.3
 
 - gitlab: upgrade to CE v8.11.3
 
-**8.11.2**
+## 8.11.2
 
 - gitlab: upgrade to CE v8.11.2
 
-**8.11.0**
+## 8.11.0
 
 - gitlab: upgrade to CE v8.11.0
 - added `GITLAB_SECRETS_SECRET_KEY_BASE`
 - added `GITLAB_SECRETS_OTP_KEY_BASE`
 
-**Important**
+## Important
+
 When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/.secret` for  `GITLAB_SECRETS_OTP_KEY_BASE` otherwise it will break your 2FA .
 
-**8.10.7**
+## 8.10.7
 
 - gitlab: upgrade to CE v8.10.7
 
-**8.10.6**
+## 8.10.6
 
 - gitlab: upgrade to CE v8.10.6
 
-**8.10.5**
+## 8.10.5
 
 - gitlab: upgrade to CE v8.10.5
 
-**8.10.4**
+## 8.10.4
 
 - gitlab: upgrade to CE v8.10.4
 
-**8.10.3**
+## 8.10.3
 
 - gitlab: upgrade to CE v8.10.3
 
-**8.10.2-1**
+## 8.10.2-1
 
 - Fix `OAUTH_GOOGLE_RESTRICT_DOMAIN`
 
-**8.10.2**
+## 8.10.2
 
 - gitlab: upgrade to CE v8.10.2
 - Improve `OAUTH_GOOGLE_RESTRICT_DOMAIN` for multiple restricted domains
 
-**8.10.1**
+## 8.10.1
 
 - gitlab: upgrade to CE v8.10.1
 
-**8.10.0**
+## 8.10.0
 
 - gitlab: upgrade to CE v8.10.0
 
-**8.9.6**
+## 8.9.6
 
 - gitlab: upgrade to CE v8.9.6
 
-**8.9.5**
+## 8.9.5
 
 - gitlab: upgrade to CE v8.9.5
 
-**8.9.4**
+## 8.9.4
 
 - gitlab: upgrade to CE v8.9.4
 
-**8.9.3**
+## 8.9.3
 
 - gitlab: upgrade to CE v8.9.3
 
-**8.9.2**
+## 8.9.2
 
 - gitlab: upgrade to CE v8.9.2
 
-**8.9.1**
+## 8.9.1
 
 - gitlab: upgrade to CE v8.9.1
 
-**8.9.0**
+## 8.9.0
 
 - gitlab: upgrade to CE v8.9.0
 
-**8.8.5-1**
+## 8.8.5-1
 
 - added GitLab Container Registry support
 - added `SSL_CIPHERS` option to change ciphers of the nginx
 
-**8.8.5**
+## 8.8.5
 
 - gitlab: upgrade to CE v8.8.5
 
-**8.8.4**
+## 8.8.4
 
 - gitlab: upgrade to CE v8.8.4
 - added `GITLAB_PROJECTS_LIMIT` configuration option
 
-**8.8.3**
+## 8.8.3
 
 - gitlab: upgrade to CE v8.8.3
 
-**8.8.2**
+## 8.8.2
 
 - gitlab: upgrade to CE v8.8.2
 
-**8.8.1**
+## 8.8.1
 
 - gitlab: upgrade to CE v8.8.1
 
-**8.8.0**
+## 8.8.0
 
 - gitlab: upgrade to CE v8.8.0
 - oauth: exposed `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` options for users for GitHub Enterprise.
 
-**8.7.6**
+## 8.7.6
 
 - gitlab: upgrade to CE v8.7.6
 
-**8.7.5**
+## 8.7.5
 
 - gitlab: upgrade to CE v8.7.5
 
-**8.7.3**
+## 8.7.3
 
 - gitlab: upgrade to CE v8.7.3
 
-**8.7.2**
+## 8.7.2
 
 - gitlab: upgrade to CE v8.7.2
 
-**8.7.1**
+## 8.7.1
 
 - gitlab: upgrade to CE v8.7.1
 
-**8.7.0**
+## 8.7.0
 
 - gitlab-shell: upgrade to v.2.7.2
 - gitlab: upgrade to CE v8.7.0
@@ -2882,37 +2877,37 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - OAuth: Added `OAUTH_EXTERNAL_PROVIDERS` to specify external oauth providers.
 - Exposed `GITLAB_TRUSTED_PROXIES` configuration parameter
 
-**8.6.7**
+## 8.6.7
 
 - added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups
 - gitlab: upgrade to CE v8.6.7
 
-**8.6.6**
+## 8.6.6
 
 - gitlab: upgrade to CE v8.6.6
 
-**8.6.5**
+## 8.6.5
 
 - gitlab: upgrade to CE v8.6.5
 
-**8.6.4**
+## 8.6.4
 
 - gitlab: upgrade to CE v8.6.4
 
-**8.6.3**
+## 8.6.3
 
 - gitlab-shell: upgrade to v.2.6.12
 - gitlab: upgrade to CE v8.6.3
 
-**8.6.2**
+## 8.6.2
 
 - gitlab: upgrade to CE v8.6.2
 
-**8.6.1**
+## 8.6.1
 
 - gitlab: upgrade to CE v8.6.1
 
-**8.6.0**
+## 8.6.0
 
 - gitlab-shell: upgrade to v.2.6.11
 - gitlab-workhorse: upgrade to v0.7.1
@@ -2920,59 +2915,59 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - exposed configuration parameters for auth0 OAUTH support
 - fixed relative_url support
 
-**8.5.8**
+## 8.5.8
 
 - gitlab: upgrade to CE v8.5.8
 
-**8.5.7**
+## 8.5.7
 
 - gitlab: upgrade to CE v8.5.7
 
-**8.5.5**
+## 8.5.5
 
 - gitlab: upgrade to CE v8.5.5
 
-**8.5.4**
+## 8.5.4
 
 - gitlab: upgrade to CE v8.5.4
 
-**8.5.3**
+## 8.5.3
 
 - gitlab: upgrade to CE v8.5.3
 
-**8.5.1**
+## 8.5.1
 
 - gitlab: upgrade to CE v8.5.1
 
-**8.5.0**
+## 8.5.0
 
 - gitlab-workhorse: upgrade to v0.6.4
 - gitlab: upgrade to CE v8.5.0
 - firstrun: expose `GITLAB_ROOT_EMAIL` configuration option
 - expose `OAUTH_AUTO_LINK_SAML_USER` configuration parameter
 
-**8.4.4**
+## 8.4.4
 
 - gitlab: upgrade to CE v8.4.4
 
-**8.4.3**
+## 8.4.3
 
 - gitlab: upgrade to CE v8.4.3
 
-**8.4.2**
+## 8.4.2
 
 - gitlab-workhorse: upgrade to v0.6.2
 - gitlab: upgrade to CE v8.4.2
 
-**8.4.1**
+## 8.4.1
 
 - gitlab: upgrade to CE v8.4.1
 
-**8.4.0-1**
+## 8.4.0-1
 
 - `assets:precompile` moved back to build time
 
-**8.4.0**
+## 8.4.0
 
 - gitlab-shell: upgrade to v.2.6.10
 - gitlab-workhorse: upgrade to v0.6.1
@@ -2981,25 +2976,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - oauth: expose azure oauth configuration options
 - `assets:precompile` executed at runtime
 
-**8.3.4**
+## 8.3.4
 
 - gitlab-workhorse: upgrade to v0.5.4
 - gitlab: upgrade to CE v8.3.4
 - expose `LDAP_TIMEOUT` configuration parameter
 
-**8.3.2**
+## 8.3.2
 
 - gitlab: upgrade to CE v8.3.2
 
-**8.3.1**
+## 8.3.1
 
 - gitlab: upgrade to CE v8.3.1
 
-**8.3.0-1**
+## 8.3.0-1
 
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 
-**8.3.0**
+## 8.3.0
 
 - `envsubst` is now used for updating the configurations
 - renamed config `CA_CERTIFICATES_PATH` to `SSL_CA_CERTIFICATES_PATH`
@@ -3012,24 +3007,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - removed `NGINX_MAX_UPLOAD_SIZE` configuration parameter
 - gitlab-shell: upgrade to v.2.6.9
 
-**8.2.3**
+## 8.2.3
 
 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used.
 - added `GITLAB_BACKUP_PG_SCHEMA` configuration parameter
 - gitlab: upgrade to CE v8.2.3
 
-**8.2.2**
+## 8.2.2
 
 - added `GITLAB_DOWNLOADS_DIR` configuration parameter
 - `DB_TYPE` parameter renamed to `DB_ADAPTER` with `mysql2` and `postgresql` as accepted values
 - exposed `DB_ENCODING` parameter
 - gitlab: upgrade to CE v8.2.2
 
-**8.2.1-1**
+## 8.2.1-1
 
 - fixed typo while setting the value of `GITLAB_ARTIFACTS_DIR`
 
-**8.2.1**
+## 8.2.1
 
 - expose rack_attack configuration options
 - gitlab-shell: upgrade to v.2.6.8
@@ -3037,7 +3032,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added `GITLAB_ARTIFACTS_ENABLED` configuration parameter
 - added `GITLAB_ARTIFACTS_DIR` configuration parameter
 
-**8.2.0**
+## 8.2.0
 
 - gitlab-shell: upgrade to v.2.6.7
 - gitlab-workhorse: upgrade to v.0.4.2
@@ -3047,67 +3042,67 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added `GITLAB_PROJECTS_BUILDS` configuration parameter
 - added `GITLAB_LFS_ENABLED` configuration parameter
 
-**8.1.4**
+## 8.1.4
 
 - gitlab: upgrade to CE v8.1.4
 
-**8.1.3**
+## 8.1.3
 
 - proper long-term fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - gitlab: upgrade to CE v8.1.3
 - Expose Facebook OAUTH configuration parameters
 
-**8.1.2**
+## 8.1.2
 
 - gitlab: upgrade to CE v8.1.2
 - removed `GITLAB_SATELLITES_TIMEOUT` configuration parameter
 
-**8.1.0-2**
+## 8.1.0-2
 
 - Recompile assets when `GITLAB_RELATIVE_URL_ROOT` is used Fixes #481
 
-**8.1.0-1**
+## 8.1.0-1
 
 - temporary fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 
-**8.1.0**
+## 8.1.0
 
 - gitlab: upgrade to CE v8.1.0
 - gitlab-git-http-server: upgrade to v0.3.0
 
-**8.0.5-1**
+## 8.0.5-1
 
 - speed up container startup by compiling assets at image build time
 - test connection to redis-server
 
-**8.0.5**
+## 8.0.5
 
 - gitlab: upgrade to CE v.8.0.5
 
-**8.0.4-2**
+## 8.0.4-2
 
 - fix http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used
 - allow user to override `OAUTH_ENABLED` setting
 
-**8.0.4-1**
+## 8.0.4-1
 
 - update baseimage to `sameersbn/ubuntu:14.04.20151011`
 
-**8.0.4**
+## 8.0.4
 
 - gitlab: upgrade to CE v.8.0.4
 
-**8.0.3**
+## 8.0.3
 
 - gitlab: upgrade to CE v.8.0.3
 
-**8.0.2**
+## 8.0.2
 
 - gitlab: upgrade to CE v.8.0.2
 - added `IMAP_STARTTLS` parameter, defaults to `false`
 - expose oauth parameters for crowd server
 
-**8.0.0**
+## 8.0.0
 
 - set default value of `DB_TYPE` to `postgres`
 - added sample Kubernetes rc and service description files
@@ -3120,91 +3115,91 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - removed `GITLAB_ROBOTS_OVERRIDE` parameter. Override default `robots.txt` if `GITLAB_ROBOTS_PATH` exists.
 - added CI redirection using `GITLAB_CI_HOST` parameter
 
-**7.14.3**
+## 7.14.3
 
 - gitlab: upgrade to CE v.7.14.3
 
-**7.14.2**
+## 7.14.2
 
 - Apply grsecurity policies to nodejs binary #394
 - Fix broken emojis post migration #196
 - gitlab-shell: upgrade to v.2.6.5
 - gitlab: upgrade to CE v.7.14.2
 
-**7.14.1**
+## 7.14.1
 
 - gitlab: upgrade to CE v.7.14.1
 
-**7.14.0**
+## 7.14.0
 
 - gitlab-shell: upgrade to v.2.6.4
 - gitlab: upgrade to CE v.7.14.0
 
-**7.13.5**
+## 7.13.5
 
 - gitlab: upgrade to CE v.7.13.5
 
-**7.13.4**
+## 7.13.4
 
 - gitlab: upgrade to CE v.7.13.4
 
-**7.13.3**
+## 7.13.3
 
 - gitlab: upgrade to CE v.7.13.3
 
-**7.13.2**
+## 7.13.2
 
 - gitlab: upgrade to CE v.7.13.2
 
-**7.13.1**
+## 7.13.1
 
 - gitlab: upgrade to CE v.7.13.1
 
-**7.13.0**
+## 7.13.0
 
 - expose SAML OAuth provider configuration
 - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration
 - gitlab: upgrade to CE v.7.13.0
 
-**7.12.2-2**
+## 7.12.2-2
 
 - enable persistence `.secret` file used in 2FA
 
-**7.12.2-1**
+## 7.12.2-1
 
 - fixed gitlab:backup:restore raketask
 
-**7.12.2**
+## 7.12.2
 
 - gitlab: upgrade to CE v.7.12.2
 
-**7.12.1**
+## 7.12.1
 
 - gitlab: upgrade to CE v.7.12.1
 
-**7.12.0**
+## 7.12.0
 
 - added `SMTP_TLS` configuration parameter
 - gitlab: upgrade to CE v.7.12.0
 - added `OAUTH_AUTO_LINK_LDAP_USER` configuration parameter
 
-**7.11.4-1**
+## 7.11.4-1
 
 - base image update to fix SSL vulnerability
 
-**7.11.4**
+## 7.11.4
 
 - gitlab: upgrade to CE v.7.11.4
 
-**7.11.3**
+## 7.11.3
 
 - gitlab: upgrade to CE v.7.11.3
 
-**7.11.2**
+## 7.11.2
 
 - gitlab: upgrade to CE v.7.11.2
 
-**7.11.0**
+## 7.11.0
 
 - init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option
 - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option
@@ -3212,24 +3207,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - gitlab: upgrade to CE v.7.11.0
 - init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter
 
-**7.10.4**
+## 7.10.4
 
 - gitlab: upgrade to CE v.7.10.4
 
-**7.10.3**
+## 7.10.3
 
 - gitlab: upgrade to CE v.7.10.3
 
-**7.10.2**
+## 7.10.2
 
 - init: added support for remote AWS backups
 - gitlab: upgrade to CE v.7.10.2
 
-**7.10.1**
+## 7.10.1
 
 - gitlab: upgrade to CE v.7.10.1
 
-**7.10.0**
+## 7.10.0
 
 - gitlab-shell: upgrade to v.2.6.2
 - gitlab: upgrade to CE v.7.10.0
@@ -3237,11 +3232,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added `GITLAB_EMAIL_REPLY_TO` configuration option
 - init: added `LDAP_BLOCK_AUTO_CREATED_USERS` configuration option
 
-**7.9.4**
+## 7.9.4
 
 - gitlab: upgrade to CE v.7.9.4
 
-**7.9.3**
+## 7.9.3
 
 - added `NGINX_PROXY_BUFFERING` option
 - added `NGINX_ACCEL_BUFFERING` option
@@ -3251,16 +3246,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - fixes: "transfer closed with xxx bytes remaining to read" error
 - gitlab: upgrade to CE v.7.9.3
 
-**7.9.2**
+## 7.9.2
 
 - gitlab: upgrade to CE v.7.9.2
 
-**7.9.1**
+## 7.9.1
 
 - init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `none`
 - gitlab: upgrade to CE v.7.9.1
 
-**7.9.0**
+## 7.9.0
 
 - gitlab-shell: upgrade to v.2.6.0
 - gitlab: upgrade to CE v.7.9.0
@@ -3270,20 +3265,20 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: added BitBucket OAuth configuration support
 - init: added `GITLAB_EMAIL_DISPLAY_NAME` configuration option
 
-**7.8.4**
+## 7.8.4
 
 - gitlab: upgrade to CE v.7.8.4
 
-**7.8.2**
+## 7.8.2
 
 - gitlab: upgrade to CE v.7.8.2
 
-**7.8.1**
+## 7.8.1
 
 - gitlab-shell: upgrade to v.2.5.4
 - gitlab: upgrade to CE v.7.8.1
 
-**7.8.0**
+## 7.8.0
 
 - update postgresql client to the latest version, Closes #249
 - removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui
@@ -3296,16 +3291,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - init: set `LDAP_METHOD` default value to `plain`
 - init: added gitlab oauth configuration support
 
-**7.7.2**
+## 7.7.2
 
 - gitlab-shell: upgrade to v.2.4.2
 - gitlab: upgrade to CE v.7.7.2
 
-**7.7.1**
+## 7.7.1
 
 - gitlab: upgrade to CE v.7.7.1
 
-**7.7.0**
+## 7.7.0
 
 - init: added GOOGLE_ANALYTICS_ID configuration option
 - added support for mantis issue tracker
@@ -3313,55 +3308,55 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - gitlab-shell: upgrade to v.2.4.1
 - gitlab: upgrade to CE v.7.7.0
 
-**7.6.2**
+## 7.6.2
 
 - gitlab: upgrade to CE v.7.6.2
 
-**7.6.1**
+## 7.6.1
 
 - disable nginx ipv6 if host does not support it.
 - init: added GITLAB_BACKUP_TIME configuration option
 - gitlab: upgrade to CE v.7.6.1
 
-**7.6.0**
+## 7.6.0
 
 - add support for configuring piwik
 - gitlab-shell: upgrade to v.2.4.0
 - gitlab: upgrade to CE v.7.6.0
 
-**7.5.3**
+## 7.5.3
 
 - accept `BACKUP` parameter while running the restore rake task, closes #220
 - init: do not run `gitlab:satellites:create` rake task at startup
 - gitlab: upgrade to CE v.7.5.3
 
-**7.5.2**
+## 7.5.2
 
 - gitlab: upgrade to CE v.7.5.2
 
-**7.5.1**
+## 7.5.1
 
 - gitlab: upgrade to CE v.7.5.1
 - gitlab-shell to v2.2.0
 - added `GITLAB_TIMEZONE` configuration option
 - added `GITLAB_EMAIL_ENABLED` configuration option
 
-**7.4.4**
+## 7.4.4
 
 - gitlab: upgrade to CE v.7.4.4
 - added `SSL_VERIFY_CLIENT` configuration option
 - added `NGINX_WORKERS` configuration option
 - added `USERMAP_UID` and `USERMAP_GID` configuration option
 
-**7.4.3**
+## 7.4.3
 
 - gitlab: upgrade to CE v.7.4.3
 
-**7.4.2**
+## 7.4.2
 
 - gitlab: upgrade to CE v.7.4.2
 
-**7.4.0**
+## 7.4.0
 
 - gitlab: upgrade to CE v.7.4.0
 - config: added `LDAP_ACTIVE_DIRECTORY` configuration option
@@ -3370,11 +3365,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - automatically compile assets if relative_url is changed
 - launch all daemons via supervisord
 
-**7.3.2-1**
+## 7.3.2-1
 
 - fix mysql status check
 
-**7.3.2**
+## 7.3.2
 
 - upgrade to gitlab-ce 7.3.2
 - removed internal mysql server
@@ -3384,24 +3379,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added GITLAB_GRAVATAR_ENABLED configuration option
 - added fig.yml
 
-**7.3.1-3**
+## 7.3.1-3
 
 - fix mysql command again!
 
-**7.3.1-2**
+## 7.3.1-2
 
 - fix mysql server status check
 
-**7.3.1-1**
+## 7.3.1-1
 
 - plug bash vulnerability by switching to dash shell
 - automatically run the `gitlab:setup` rake task for new installs
 
-**7.3.1**
+## 7.3.1
 
 - upgrade to gitlab-ce 7.3.1
 
-**7.3.0**
+## 7.3.0
 
 - upgrade to gitlab-ce 7.3.0
 - added GITLAB_WEBHOOK_TIMEOUT configuration option
@@ -3409,7 +3404,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - removed internal redis server
 - shutdown the container gracefully
 
-**7.2.2**
+## 7.2.2
 
 - upgrade to gitlab-ce 7.2.2
 - added GITLAB_HTTPS_HSTS_ENABLED configuration option (advanced config)
@@ -3420,25 +3415,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added GITLAB_SSH_HOST configuration option
 - added GITLAB_USERNAME_CHANGE configuration option
 
-**7.2.1-1**
+## 7.2.1-1
 
 - removed the GITLAB_HTTPS_ONLY configuration option
 - added NGINX_X_FORWARDED_PROTO configuration option
 - optimization: talk directly to the unicorn worker from gitlab-shell
 
-**7.2.1**
+## 7.2.1
 
 - upgrade to gitlab-ce 7.2.1
 - added new SMTP_ENABLED configuration option.
 
-**7.2.0-1**
+## 7.2.0-1
 
 - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used.
 - fix relative root access without the trailing '/' character
 - added separate server block for http config in gitlab.https.permissive. Fixes #127
 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option.
 
-**7.2.0**
+## 7.2.0
 
 - upgrade to gitlab-ce 7.2.0
 - update to the sameersbn/ubuntu:14.04.20140818 baseimage
@@ -3454,13 +3449,13 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - update to gitlab-shell 1.9.7
 - update to the sameersbn/ubuntu:14.04.20140812 baseimage
 
-**7.1.1**
+## 7.1.1
 
 - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110
 - upgrade to gitlab-ce 7.1.1
 - run /etc/init.d/gitlab as git user, plays nicely with selinux
 
-**7.1.0**
+## 7.1.0
 
 - removed GITLAB_SUPPORT configuration option
 - upgrade to gitlab-ce 7.1.0
@@ -3470,7 +3465,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - no more root access over ssh, use nsenter instead
 - upgrade to nginx-1.6.x series from the nginx/stable ppa
 
-**7.0.0**
+## 7.0.0
 
 - upgrade to gitlab-7.0.0
 - fix repository and gitlab-satellites directory permissions.
@@ -3481,21 +3476,21 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - automatically migrate database when gitlab version is updated
 - upgrade to gitlab-shell 1.9.5
 
-**6.9.2**
+## 6.9.2
 
 - upgrade to gitlab-ce 6.9.2
 
-**6.9.1**
+## 6.9.1
 
 - upgrade to gitlab-ce 6.9.1
 
-**6.9.0**
+## 6.9.0
 
 - upgrade to gitlab-ce 6.9.0
 - added GITLAB_RELATIVE_URL_ROOT configuration option
 - added NGINX_MAX_UPLOAD_SIZE configuration to specify the maximum acceptable size of attachments.
 
-**6.8.2**
+## 6.8.2
 
 - upgrade to gitlab-ce 6.8.2
 - renamed configuration option GITLAB_SHELL_SSH_PORT to GITLAB_SSH_PORT
@@ -3517,11 +3512,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - cache compiled assets to boost application startup.
 - fix symlink to uploads directory
 
-**6.8.1**
+## 6.8.1
 
 - upgrade to gitlab-ce 6.8.1
 
-**6.8.0**
+## 6.8.0
 
 - upgrade to gitlab-shell 1.9.3
 - added GITLAB_SIGNIN setting to enable or disable standard login form
@@ -3530,35 +3525,35 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - use sameersbn/ubuntu as the base docker image
 - install postgresql-client to fix restoring backups when used with a postgresql database backend.
 
-**6.7.5**
+## 6.7.5
 
 - upgrade gitlab to 6.7.5
 - support linking to mysql and postgresql containers
 - added DEFAULT_PROJECTS_LIMIT configuration option
 
-**6.7.4**
+## 6.7.4
 
 - upgrade gitlab to 6.7.4
 - added SMTP_AUTHENTICATION configuration option, defaults to :login.
 - added LDAP configuration options.
 
-**6.7.3**
+## 6.7.3
 
 - upgrade gitlab to 6.7.3
 - install ruby2.0 from ppa
 
-**6.7.2**
+## 6.7.2
 
 - upgrade gitlab to 6.7.2
 - upgrade gitlab-shell to 1.9.1
 - reorganize repo
 - do not perform system upgrades (<http://crosbymichael.com/dockerfile-best-practices-take-2.html>)
 
-**6.6.5**
+## 6.6.5
 
 - upgraded to gitlab-6.6.5
 
-**v6.6.4**
+## v6.6.4
 
 - upgraded to gitlab-6.6.4
 - added changelog
@@ -3569,7 +3564,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added DB_PORT configuration option
 - changed backup time to 4am (UTC)
 
-**v6.6.2**
+## v6.6.2
 
 - upgraded to gitlab-6.6.2
 - added automated daily/monthly backups feature
@@ -3579,7 +3574,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/
 - added app:rake command for executing gitlab rake tasks
 - documented hardware requirements
 
-**v6.6.1**
+## v6.6.1
 
 - upgraded to gitlabhq-6.6.1
 - reformatted README

From d54b59a002609ada252c99364600d80a91be8908 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 May 2025 23:37:23 +0200
Subject: [PATCH 1036/1124] Cleanup documentation

---
 docs/container_registry.md    | 97 +++++++++++++++++------------------
 docs/exposing-ssh-port.md     |  3 +-
 docs/keycloak-idp.md          |  4 +-
 docs/s3_compatible_storage.md | 34 ++++++------
 4 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/docs/container_registry.md b/docs/container_registry.md
index b536dac6b..66c6f5877 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -1,24 +1,32 @@
-GitLab Container Registry
-=========================
+# GitLab Container Registry
+
 Since `8.8.0` GitLab introduces a container registry. GitLab is helping to authenticate the user against the registry and proxy it via Nginx. By [Registry](https://docs.docker.com/registry) we mean the registry from docker whereas *Container Registry* is the feature in GitLab.
 
-- [Prerequisites](#prerequisites)
-- [Installation](#installation)
-- [Configuration](#configuration)
-- [Maintenance](#maintenance)
+- [GitLab Container Registry](#gitlab-container-registry)
+  - [Prerequisites](#prerequisites)
+  - [Installation](#installation)
+    - [Setup with Nginx as Reverse Proxy](#setup-with-nginx-as-reverse-proxy)
+      - [Create auth tokens](#create-auth-tokens)
+      - [Update docker-compose.yml](#update-docker-composeyml)
+      - [Nginx Site Configuration](#nginx-site-configuration)
+  - [Configuration](#configuration)
+    - [Available Parameters](#available-parameters)
+    - [Container Registry storage driver](#container-registry-storage-driver)
+      - [Example for Amazon Simple Storage Service (s3)](#example-for-amazon-simple-storage-service-s3)
+    - [Storage limitations](#storage-limitations)
+  - [Maintenance](#maintenance)
     - [Creating Backups](#creating-backups)
     - [Restoring Backups](#restoring-backups)
-- [Upgrading from an existing GitLab instance](#Upgrading-from-an-existing-GitLab-instance)
-
-# Prerequisites
+  - [Upgrading from an existing GitLab installation](#upgrading-from-an-existing-gitlab-installation)
 
-  - [Docker Distribution](https://github.com/docker/distribution) >= 2.4
-  - [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1
+## Prerequisites
 
+- [Docker Distribution](https://github.com/docker/distribution) >= 2.4
+- [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1
 
-# Installation
+## Installation
 
-## Setup with Nginx as Reverse Proxy
+### Setup with Nginx as Reverse Proxy
 
 We assume that you already have Nginx installed on your host system and that
 you use a reverse proxy configuration to connect to your GitLab container.
@@ -26,13 +34,13 @@ you use a reverse proxy configuration to connect to your GitLab container.
 In this example we use a dedicated domain for the registry. The URLs for
 the GitLab installation and the registry are:
 
-* git.example.com
-* registry.example.com
+- git.example.com
+- registry.example.com
 
 > Note: You could also run everything on the same domain and use different ports
 > instead. The required configuration changes below should be straightforward.
 
-### Create auth tokens
+#### Create auth tokens
 
 GitLab needs a certificate ("auth token") to talk to the registry API. The
 tokens must be provided in the `/certs` directory of your container. You could
@@ -55,8 +63,7 @@ openssl x509 -in registry.csr -out registry.crt -req -signkey registry.key -days
 It doesn't matter which details (domain name, etc.) you enter during key
 creation. This information is not used at all.
 
-
-### Update docker-compose.yml
+#### Update docker-compose.yml
 
 First add the configuration for the registry container to your `docker-compose.yml`.
 
@@ -108,7 +115,7 @@ Then update the `volumes` and `environment` sections of your `gitlab` container:
             - ./certs:/certs
 ```
 
-### Nginx Site Configuration
+#### Nginx Site Configuration
 
 ```nginx
 server {
@@ -150,9 +157,9 @@ server {
 }
 ```
 
-# Configuration
+## Configuration
 
-## Available Parameters
+### Available Parameters
 
 Here is an example of all configuration parameters that can be used in the GitLab container.
 
@@ -174,15 +181,15 @@ where:
 
 | Parameter | Description |
 | --------- | ----------- |
-| `GITLAB_REGISTRY_ENABLED ` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. |
-| `GITLAB_REGISTRY_HOST `    | The host URL under which the Registry will run and the users will be able to use. |
-| `GITLAB_REGISTRY_PORT `    | The port under which the external Registry domain will listen on. |
-| `GITLAB_REGISTRY_API_URL ` | The internal API URL under which the Registry is exposed to. |
-| `GITLAB_REGISTRY_KEY_PATH `| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
-| `GITLAB_REGISTRY_PATH `    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
+| `GITLAB_REGISTRY_ENABLED` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. |
+| `GITLAB_REGISTRY_HOST`    | The host URL under which the Registry will run and the users will be able to use. |
+| `GITLAB_REGISTRY_PORT`    | The port under which the external Registry domain will listen on. |
+| `GITLAB_REGISTRY_API_URL` | The internal API URL under which the Registry is exposed to. |
+| `GITLAB_REGISTRY_KEY_PATH`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
+| `GITLAB_REGISTRY_PATH`    | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
 | `GITLAB_REGISTRY_ISSUER`  | This should be the same value as configured in Registry's `issuer`. Otherwise the authentication will not work. For more info read the [token auth configuration documentation][token-config]. |
-| `SSL_REGISTRY_KEY_PATH `    | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. |
-| `SSL_REGISTRY_CERT_PATH `    | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. |
+| `SSL_REGISTRY_KEY_PATH`    | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. |
+| `SSL_REGISTRY_CERT_PATH`    | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. |
 
 For more info look at [Available Configuration Parameters](https://github.com/sameersbn/docker-gitlab#available-configuration-parameters).
 
@@ -200,12 +207,9 @@ gitlab:
 ...
 ```
 
-## Container Registry storage driver
+### Container Registry storage driver
 
-You can configure the Container Registry to use a different storage backend by
-configuring a different storage driver. By default the GitLab Container Registry
-is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path)
-configuration. These configurations will all be done in the registry container.
+You can configure the Container Registry to use a different storage backend by configuring a different storage driver. By default the GitLab Container Registry is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path) configuration. These configurations will all be done in the registry container.
 
 The different supported drivers are:
 
@@ -227,7 +231,7 @@ Read more about the individual driver's config options in the
 > If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be separated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted separated the whole restoring process of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail.
 > An example how it works is in the `docker-compose`.
 
-### Example for Amazon Simple Storage Service (s3)
+#### Example for Amazon Simple Storage Service (s3)
 
 If you want to configure your registry via `/etc/docker/registry/config.yml` your storage part should like this snippet below.
 
@@ -243,8 +247,6 @@ storage:
     enabled: true
 ```
 
-
-
 ```yaml
  ...
  registry:
@@ -267,18 +269,17 @@ storage:
 
 Generally for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration).
 
-
-## Storage limitations
+### Storage limitations
 
 Currently, there is no storage limitation, which means a user can upload an
 infinite amount of Docker images with arbitrary sizes. This setting will be
 configurable in future releases.
 
+## Maintenance
 
-# Maintenance
 If you use another storage configuration than filesystem it will have no impact on your Maintenance workflow.
 
-## Creating Backups
+### Creating Backups
 
 Creating Backups is the same like without a container registry. I would recommend to stop your registry container.
 
@@ -287,11 +288,13 @@ docker stop registry gitlab && docker rm registry gitlab
 ```
 
 Execute the rake task with a removeable container.
+
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
 ```
-## Restoring Backups
+
+### Restoring Backups
 
 GitLab also defines a rake task to restore a backup.
 
@@ -317,8 +320,7 @@ docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
-# Upgrading from an existing GitLab installation
-
+## Upgrading from an existing GitLab installation
 
 If you want enable this feature for an existing instance of GitLab you need to do the following steps.
 
@@ -365,6 +367,7 @@ docker run --name registry -d \
 --env 'REGISTRY_STORAGE_DELETE_ENABLED=true' \
 registry:2.4.1
 ```
+
 - **Step 6**: Start the image
 
 ```bash
@@ -381,11 +384,5 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 sameersbn/gitlab:18.0.0
 ```
 
-
-[wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate
-[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040
-[docker-insecure]: https://docs.docker.com/registry/insecure/
-[registry-deploy]: https://docs.docker.com/registry/deploying/
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
 [token-config]: https://docs.docker.com/registry/configuration/#token
-[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md
diff --git a/docs/exposing-ssh-port.md b/docs/exposing-ssh-port.md
index 9c37baee6..a2dbca10a 100644
--- a/docs/exposing-ssh-port.md
+++ b/docs/exposing-ssh-port.md
@@ -3,6 +3,5 @@
 This is how to expose this internal ssh port without affecting the existing ssh port on the host server:
 
 * use this configuration script: [`../contrib/expose-gitlab-ssh-port.sh`](../contrib/expose-gitlab-ssh-port.sh)
-* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test
-](https://github.com/harobed/docker-gitlab-vagrant-test)
+* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test](https://github.com/harobed/docker-gitlab-vagrant-test)
 * more information, see [« Exposing ssh port in dockerized gitlab-ce »](https://blog.xiaket.org/2017/exposing.ssh.port.in.dockerized.gitlab-ce.html) post
diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md
index 61f76ce65..04bc3c734 100644
--- a/docs/keycloak-idp.md
+++ b/docs/keycloak-idp.md
@@ -37,7 +37,7 @@ Set the following in the docker-compose file:
     - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://<your-ip-address>:10081/auth/realms/master/protocol/openid-connect/logout
 ```
 
-`<your-ip-address>` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `<your-ip-address>` would be different as would the port and the realm. 
+`<your-ip-address>` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `<your-ip-address>` would be different as would the port and the realm.
 
 The following must also be configured:
 
@@ -47,7 +47,7 @@ The following must also be configured:
     - OAUTH2_GENERIC_USER_EMAIL='email'    
 ```
 
-The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. 
+The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure.
 
 Also, make sure the following variables are filled in the docker-compose file:
 
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 35a15a0d5..4fb7d0fb3 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -1,23 +1,22 @@
-GitLab Backup to s3 compatible storage
-=================================================
+# GitLab Backup to s3 compatible storage
 
-Enables automatic backups to self-hosted s3 compatible storage like minio (https://minio.io/) and others.
+Enables automatic backups to self-hosted s3 compatible storage like minio (<https://minio.io/>) and others.
 This is an extend of AWS Remote Backups.
 
 As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb)
 
 - [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage)
-- [Available Parameters](#available-parameters)
-- [Installation](#installation)
-  - [Docker Compose](#docker-compose)
-  - [Creating Backups](#creating-backups)
-  - [Restoring Backups](#restoring-backups)
+  - [Available Parameters](#available-parameters)
+  - [Installation](#installation)
+    - [Docker Compose](#docker-compose)
+    - [Creating Backups](#creating-backups)
+    - [Restoring Backups](#restoring-backups)
 
-# Available Parameters
+## Available Parameters
 
 Here is an example of all configuration parameters that can be used in the GitLab container.
 
-```
+```yaml
 ...
 gitlab:
     ...
@@ -28,7 +27,6 @@ gitlab:
     - AWS_BACKUP_SECRET_ACCESS_KEY=minio123
     - AWS_BACKUP_BUCKET=docker
     - AWS_BACKUP_MULTIPART_CHUNK_SIZE=104857600
-
 ```
 
 where:
@@ -46,7 +44,7 @@ For more info look at [Available Configuration Parameters](https://github.com/sa
 
 A minimum set of these parameters are required to use the s3 compatible storage:
 
-```yml
+```yaml
 ...
 gitlab:
     environment:
@@ -57,11 +55,12 @@ gitlab:
     - AWS_BACKUP_BUCKET=docker
 ...
 ```
-# Installation
+
+## Installation
 
 Starting a fresh installation with GitLab would be like the `docker-compose` file.
 
-## Docker Compose
+### Docker Compose
 
 This is an example with minio.
 
@@ -214,15 +213,16 @@ services:
     command: server /export
 ```
 
-
-## Creating Backups
+### Creating Backups
 
 Execute the rake task with a removeable container.
+
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:8.16.4 app:rake gitlab:backup:create
 ```
-## Restoring Backups
+
+### Restoring Backups
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 

From 4c2faca21314f92899585a7106f98a74d571c673 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 18 May 2025 08:53:04 +0200
Subject: [PATCH 1037/1124] Update README to add informations about GitLab CE
 and required PostgreSQL versions

---
 README.md | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 18a2e00a9..baa4a6d6d 100644
--- a/README.md
+++ b/README.md
@@ -254,10 +254,10 @@ This behavior can be checked using the command `docker logs` and an output like
 …
 Configuring gitlab::database
 - Installing postgresql client to avoid version mismatch on dumping
--- Detected server version: 140007
+-- Detected server version: 160009
 - Generating /home/git/.postgresqlrc
-14 postgresql:5432 gitlabhq_production
-- Uninstalling unused client(s): postgresql-client-12 postgresql-client-13 postgresql-client-15
+16 postgresql:5432 gitlabhq_production
+- Uninstalling unused client(s): postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-17
 …
 ````
 
@@ -265,10 +265,16 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 
 - `postgresql-client-13`,
 - `postgresql-client-14`,
-- `postgresql-client-15`.
-- and `postgresql-client-16`.
+- `postgresql-client-15`,
+- `postgresql-client-16`,
+- and `postgresql-client-17`.
 
-*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x.
+***Notes:***
+
+- GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
+- GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
+- GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
+- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 
@@ -341,10 +347,9 @@ docker run --name gitlab -d --link gitlab-postgresql:postgresql \
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
 
-- [postgres](https://hub.docker.com/_/postgres/)
-- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
-- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
-- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
+- [postgres](https://hub.docker.com/_/postgres/),
+- [kkimurak/sameersbn-postgresql](https://hub.docker.com/r/kkimurak/sameersbn-postgresql), or
+- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) .
 
 ##### Upgrading PostgreSQL
 
@@ -2722,7 +2727,14 @@ Usage when using `docker-compose` can also be found there.
 >
 > If you're using `sameersbn/postgresql` then please upgrade to `kkimurak/sameersbn-postgresql:16` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L21>).
 >
-> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
+> Please keep in mind that:
+>
+> - As of version 13.7.0, the required PostgreSQL version is 12.x.
+> - As of version 16.0.0, the required PostgreSQL version is 13.x.
+> - As of version 17.0.0, the required PostgreSQL version is 14.x.
+> - As of version 18.0.0, the required PostgreSQL version is 16.x.
+>
+> If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
 GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down.
 

From c9ec90d853e25f66e583017504aad01955f6ba53 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 18 May 2025 14:06:02 +0200
Subject: [PATCH 1038/1124] Remove user 'ubuntu' and set uid and gid for user
 'git' explicitly

---
 assets/build/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 6163e6120..f3bfff6c5 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -74,7 +74,9 @@ gem update --no-document --system "${RUBYGEMS_VERSION}"
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
 
 # add ${GITLAB_USER} user
-adduser --disabled-login --gecos 'GitLab' ${GITLAB_USER}
+deluser --remove-home ubuntu
+addgroup --gid 1000 git
+adduser --uid 1000 --gid 1000 --disabled-login --gecos 'GitLab' ${GITLAB_USER}
 passwd -d ${GITLAB_USER}
 
 # set PATH (fixes cron job PATH issues)

From e238e227ab678321a57c85803a3785cc74cffb4d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 18 May 2025 17:48:33 +0200
Subject: [PATCH 1039/1124] Update NODE_OPTIONS in functions to match install
 script

---
 assets/runtime/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index b32048fb8..de90c30a2 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2260,7 +2260,7 @@ migrate_database() {
       chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
       exec_as_git yarn install --production --pure-lockfile
       echo "Recompiling assets (relative_url in use), this could take a while..."
-      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1
+      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1
     fi
 
     echo "Clearing cache..."

From 576243c649b4cec8831daf3fd13ce26c3670eeaf Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 19 May 2025 07:17:57 +0200
Subject: [PATCH 1040/1124] Remove disable login option for adduser in order to
 allow user 'git' to login

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index f3bfff6c5..9cd6dd104 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -76,7 +76,7 @@ rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
 # add ${GITLAB_USER} user
 deluser --remove-home ubuntu
 addgroup --gid 1000 git
-adduser --uid 1000 --gid 1000 --disabled-login --gecos 'GitLab' ${GITLAB_USER}
+adduser --uid 1000 --gid 1000 --gecos 'GitLab' ${GITLAB_USER}
 passwd -d ${GITLAB_USER}
 
 # set PATH (fixes cron job PATH issues)

From 8408f1e06451c6f933011bc1825f42e29c601431 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Mon, 19 May 2025 10:49:06 +0200
Subject: [PATCH 1041/1124] Add disabled password option for adduser as
 replacement for disabled login option

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 9cd6dd104..d9826c41d 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -76,7 +76,7 @@ rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
 # add ${GITLAB_USER} user
 deluser --remove-home ubuntu
 addgroup --gid 1000 git
-adduser --uid 1000 --gid 1000 --gecos 'GitLab' ${GITLAB_USER}
+adduser --uid 1000 --gid 1000 --disabled-password --gecos 'GitLab' ${GITLAB_USER}
 passwd -d ${GITLAB_USER}
 
 # set PATH (fixes cron job PATH issues)

From 68ef26d601f245ca6551b7440c4d5ef66af6e537 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 22 May 2025 05:19:32 +0200
Subject: [PATCH 1042/1124] Upgrade GitLab CE to 18.0.1

---
 Changelog.md                            |  7 +++
 Dockerfile                              |  8 ++--
 README.md                               | 58 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f6dc204e7..0179b9f04 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.0.1
+
+- gitlab: upgrade CE to v18.0.1
+- gitaly: upgrade to v18.0.1
+- gitlab-pages: upgrade to v18.0.1
+- gitlab-shell: upgrade to v14.42.0
+
 ## 18.0.0
 
 - gitlab: upgrade CE to v18.0.0
diff --git a/Dockerfile b/Dockerfile
index e8956ec88..65a81948c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20250415.1
 
-ARG VERSION=18.0.0
+ARG VERSION=18.0.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
     RUBYGEMS_VERSION=3.6.9 \
     GOLANG_VERSION=1.24.3 \
-    GITLAB_SHELL_VERSION=14.41.0 \
-    GITLAB_PAGES_VERSION=18.0.0 \
-    GITALY_SERVER_VERSION=18.0.0 \
+    GITLAB_SHELL_VERSION=14.42.0 \
+    GITLAB_PAGES_VERSION=18.0.1 \
+    GITALY_SERVER_VERSION=18.0.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index baa4a6d6d..2b020de1f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.0.0
+# sameersbn/gitlab:18.0.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.0
+docker pull sameersbn/gitlab:18.0.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 ### Database
@@ -274,7 +274,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
 - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
 - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
-- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x.
+- GitLab CE version 18.0.1 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 
@@ -298,7 +298,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -342,7 +342,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -380,7 +380,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 #### Linking to Redis Container
@@ -407,7 +407,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 #### Mail
@@ -420,7 +420,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -440,7 +440,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -524,7 +524,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -540,7 +540,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.0.0
+ sameersbn/gitlab:18.0.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -563,7 +563,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -611,7 +611,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -817,14 +817,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.0.0
+    sameersbn/gitlab:18.0.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:sanitize
+    sameersbn/gitlab:18.0.1 app:sanitize
 ```
 
 #### Piwik
@@ -2567,7 +2567,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2602,14 +2602,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake db:setup
+    sameersbn/gitlab:18.0.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2618,7 +2618,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2667,7 +2667,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.0.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2680,7 +2680,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2711,7 +2711,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there.
 > - As of version 13.7.0, the required PostgreSQL version is 12.x.
 > - As of version 16.0.0, the required PostgreSQL version is 13.x.
 > - As of version 17.0.0, the required PostgreSQL version is 14.x.
-> - As of version 18.0.0, the required PostgreSQL version is 16.x.
+> - As of version 18.0.1, the required PostgreSQL version is 16.x.
 >
 > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
@@ -2742,12 +2742,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.0.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.0
+docker pull sameersbn/gitlab:18.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2773,7 +2773,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.1
 ```
 
 ### Shell Access
@@ -2811,7 +2811,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 7eae4e2e9..9ce7d613e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.0
+18.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ca6b49145..e74c084b4 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d33d1dbfc..a343b3776 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ec91a1c0..e51ced9bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 66c6f5877..3e9d05acf 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.0
+docker pull sameersbn/gitlab:18.0.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.0.0
+sameersbn/gitlab:18.0.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e7e45e867..629be2ebc 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 2dbd1a3ff..e276f1dd7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.0
+    image: sameersbn/gitlab:18.0.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 75988d916..cbff0fbb5 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.0.0
+        image: sameersbn/gitlab:18.0.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 37563a6a347e71e5cf32c767f6995e54bbc21a5a Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Fri, 30 May 2025 00:08:19 +0330
Subject: [PATCH 1043/1124] Remove version from docker-compose.yml

the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion
---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e51ced9bb..478c7cfbd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2.3'
 
 services:
   redis:

From ba1e228644c67a712f4f2b5eb9579a65700e836c Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Fri, 30 May 2025 00:09:21 +0330
Subject: [PATCH 1044/1124] yamllint

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 478c7cfbd..f2361b086 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-
+---
 services:
   redis:
     restart: always

From a10b1d51c897f73491971b87e0d7000903e1b8f0 Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Fri, 30 May 2025 13:53:53 +0330
Subject: [PATCH 1045/1124] Revert "yamllint"

This reverts commit ba1e228644c67a712f4f2b5eb9579a65700e836c.
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f2361b086..478c7cfbd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
----
+
 services:
   redis:
     restart: always

From fc8cca599b590572f2d69f58a7cdd87bc814db17 Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Fri, 30 May 2025 13:55:40 +0330
Subject: [PATCH 1046/1124] Remove version from compose files

---
 README.md                               | 2 --
 contrib/docker-swarm/docker-compose.yml | 2 --
 docker-compose.swarm.yml                | 1 -
 docs/docker-compose-keycloak.yml        | 2 --
 docs/docker-compose-registry.yml        | 2 --
 docs/s3_compatible_storage.md           | 2 --
 6 files changed, 11 deletions(-)

diff --git a/README.md b/README.md
index 2b020de1f..f3546b6d5 100644
--- a/README.md
+++ b/README.md
@@ -2807,8 +2807,6 @@ To do that you will need to set the environment variable `GITLAB_MONITORING_IP_W
 You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks:
 
 ```yml
-version: '2.3'
-
 services:
   gitlab:
     image: sameersbn/gitlab:18.0.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e74c084b4..0b5e97f2c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   redis:
     restart: always
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a343b3776..c16e0d823 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -1,4 +1,3 @@
-version: '3.4'
 services:
   redis:
     image: redis:7
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 629be2ebc..002bb4092 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   redis:
     restart: always
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e276f1dd7..0dd32b4a0 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   redis:
     restart: always
diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md
index 4fb7d0fb3..6e5ba10af 100644
--- a/docs/s3_compatible_storage.md
+++ b/docs/s3_compatible_storage.md
@@ -65,8 +65,6 @@ Starting a fresh installation with GitLab would be like the `docker-compose` fil
 This is an example with minio.
 
 ```yml
-version: '2'
-
 services:
   redis:
     restart: always

From d8fb586b0c20436070c26660a2eb412a87fbd916 Mon Sep 17 00:00:00 2001
From: Henadii Sychevskyi <sych74@gmail.com>
Date: Tue, 3 Jun 2025 13:27:16 +0200
Subject: [PATCH 1047/1124] redirects fix

---
 assets/runtime/config/nginx/gitlab-registry | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry
index ce98d045f..f43be97e5 100644
--- a/assets/runtime/config/nginx/gitlab-registry
+++ b/assets/runtime/config/nginx/gitlab-registry
@@ -10,7 +10,7 @@ server {
   listen *:80;
   server_name  {{GITLAB_REGISTRY_HOST}};
   server_tokens off; ## Don't show the nginx version number, a security best practice
-  return 301 https://$http_host:$request_uri;
+  return 301 https://$http_host$request_uri;
   access_log  {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log;
   error_log   {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log;
 }

From fe9ed85383e739099e6a5da6db86e23981016d08 Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:20:08 +0200
Subject: [PATCH 1048/1124] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ab79f9ce9..3e0032645 100644
--- a/README.md
+++ b/README.md
@@ -1600,7 +1600,7 @@ Enable namespace-in-path option for gitlab pages, defaults to `false`.
 
 ##### `GITLAB_PAGES_LOG_VERBOSE`
 
-Enable verbose logging for gitlab pages, defaults to `falsee`.
+Enable verbose logging for gitlab pages, defaults to `false`.
 
 ##### `GITLAB_HTTPS`
 

From b879531258fe80a58cf8ec69c77a0a7308f97d1b Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Thu, 5 Jun 2025 11:15:17 +0200
Subject: [PATCH 1049/1124] Update functions

---
 assets/runtime/functions | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 8710c54c0..66ef9562c 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1412,7 +1412,8 @@ gitlab_configure_pages(){
     GITLAB_PAGES_PORT \
     GITLAB_PAGES_HTTPS \
     GITLAB_PAGES_ARTIFACTS_SERVER \
-    GITLAB_PAGES_ACCESS_CONTROL
+    GITLAB_PAGES_ACCESS_CONTROL \
+    GITLAB_PAGES_NAMESPACE_IN_PATH
 
   if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then
     update_template ${GITLAB_CONFIG} \
@@ -2155,6 +2156,7 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_CONTROL_SERVER \
       GITLAB_PAGES_NAMESPACE_IN_PATH \
       GITLAB_PAGES_LOG_VERBOSE \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
       GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then

From b3be3a720f8ed93e8a645cf5aa38e88cd8d1f43d Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Sat, 7 Jun 2025 16:57:20 +0200
Subject: [PATCH 1050/1124] Update functions

---
 assets/runtime/functions | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index 66ef9562c..52e064772 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -2156,7 +2156,6 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_CONTROL_SERVER \
       GITLAB_PAGES_NAMESPACE_IN_PATH \
       GITLAB_PAGES_LOG_VERBOSE \
-      GITLAB_PAGES_NAMESPACE_IN_PATH \
       GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then

From 2e2f4f81767722e7e4bde4c1cb462bcf50f70247 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 12 Jun 2025 06:35:58 +0200
Subject: [PATCH 1051/1124] Upgrade GitLab CE to 18.0.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 58 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0179b9f04..e4e54153b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.0.2
+
+- gitlab: upgrade CE to v18.0.2
+- gitaly: upgrade to v18.0.2
+- gitlab-pages: upgrade to v18.0.2
+- golang: upgrade to v1.24.4
+- ubuntu: upgrade to noble-20250529
+
 ## 18.0.1
 
 - gitlab: upgrade CE to v18.0.1
diff --git a/Dockerfile b/Dockerfile
index 65a81948c..ebf602577 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250415.1
+FROM ubuntu:noble-20250529
 
-ARG VERSION=18.0.1
+ARG VERSION=18.0.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
     RUBYGEMS_VERSION=3.6.9 \
-    GOLANG_VERSION=1.24.3 \
+    GOLANG_VERSION=1.24.4 \
     GITLAB_SHELL_VERSION=14.42.0 \
-    GITLAB_PAGES_VERSION=18.0.1 \
-    GITALY_SERVER_VERSION=18.0.1 \
+    GITLAB_PAGES_VERSION=18.0.2 \
+    GITALY_SERVER_VERSION=18.0.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 2b020de1f..adccd7543 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.0.1
+# sameersbn/gitlab:18.0.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.1
+docker pull sameersbn/gitlab:18.0.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 ### Database
@@ -274,7 +274,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
 - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
 - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
-- GitLab CE version 18.0.1 and later requires PostgreSQL version 16.x.
+- GitLab CE version 18.0.2 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 
@@ -298,7 +298,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -342,7 +342,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -380,7 +380,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 #### Linking to Redis Container
@@ -407,7 +407,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 #### Mail
@@ -420,7 +420,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -440,7 +440,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -524,7 +524,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -540,7 +540,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.0.1
+ sameersbn/gitlab:18.0.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -563,7 +563,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -611,7 +611,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -817,14 +817,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.0.1
+    sameersbn/gitlab:18.0.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:sanitize
+    sameersbn/gitlab:18.0.2 app:sanitize
 ```
 
 #### Piwik
@@ -2567,7 +2567,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2602,14 +2602,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake db:setup
+    sameersbn/gitlab:18.0.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2618,7 +2618,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2667,7 +2667,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.0.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2680,7 +2680,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2711,7 +2711,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there.
 > - As of version 13.7.0, the required PostgreSQL version is 12.x.
 > - As of version 16.0.0, the required PostgreSQL version is 13.x.
 > - As of version 17.0.0, the required PostgreSQL version is 14.x.
-> - As of version 18.0.1, the required PostgreSQL version is 16.x.
+> - As of version 18.0.2, the required PostgreSQL version is 16.x.
 >
 > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 
@@ -2742,12 +2742,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.0.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.1
+docker pull sameersbn/gitlab:18.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2773,7 +2773,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2
 ```
 
 ### Shell Access
@@ -2811,7 +2811,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9ce7d613e..3d5ab6e54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.1
+18.0.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e74c084b4..a15b519ea 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a343b3776..da526b53f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e51ced9bb..a5b0b545e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 3e9d05acf..4dc45ab24 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.1
+docker pull sameersbn/gitlab:18.0.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.0.1
+sameersbn/gitlab:18.0.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 629be2ebc..12a39728a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index e276f1dd7..0d033aa49 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.1
+    image: sameersbn/gitlab:18.0.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index cbff0fbb5..be10cd2c9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.0.1
+        image: sameersbn/gitlab:18.0.2
         env:
         - name: TZ
           value: Asia/Kolkata

From de75177e22a46231a0a59dce9955b715aa128858 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 27 Jan 2025 01:18:05 +0900
Subject: [PATCH 1052/1124] Remove patch to remove HSTS setting from
 app/controller/application_controller.rb

Merged into upstream so no longer required
- gitlab-foss: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9341
  - commit df376bad3c8586eccc0ee2da1590d14a66bdff10
  - merge commit (squashed) : 9ec03807fd1ad2e0f04721abb7e29a044d5d0e75
- gitlab: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1360
  - commit 76e96878aad0a281f8c32ef98a276b499e2581ad

First contained tag:
- gitlab-foss: v9.0.0
- gitlab: v9.0.0-ee
---
 assets/build/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index d9826c41d..c6829e834 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -178,9 +178,6 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR}
 go clean --modcache
 rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT}
 
-# remove HSTS config from the default headers, we configure it in nginx
-exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb
-
 # revert `rake gitlab:setup` changes from gitlabhq/gitlabhq@a54af831bae023770bf9b2633cc45ec0d5f5a66a
 exec_as_git sed -i 's/db:reset/db:setup/' ${GITLAB_INSTALL_DIR}/lib/tasks/gitlab/setup.rake
 

From 34786748002cc8a2830c12afe2090f73ca8c3c6a Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 2 Dec 2024 23:57:40 +0900
Subject: [PATCH 1053/1124] README.md: fix some typo

- fix some typo in docs
  - #google-cloud-storage-gcs-remote-backup -> #google-cloud-storage-gcs-remote-backups
    (missing trailing "s")
  - opensource -> open source
  - #generation-of-self-signed-certificate -> #generation-of-a-self-signed-certificate
    (missing "-a")
  - postresql -> postgresql (missing "g")
  - STASRTSSL -> STARTTLS
  - clientside -> client side
  - raketasks -> rake tasks
  - healthcheck -> health check
    When referring to docker-compose's "healthcheck" setting,
    the notation without spaces is intentionally left.
- fix unclosed parentheses
---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 0480e3d75..0b46134a0 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@
         - [SAML](#saml)
         - [Crowd](#crowd)
         - [Microsoft Azure](#microsoft-azure)
-        - [Generic OAuth2](#Generic-OAuth2)
+        - [Generic OAuth2](#generic-oauth2)
         - [OpenID Connect](#openid-connect)
     - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
@@ -59,7 +59,7 @@
     - [Restoring Backups](#restoring-backups)
     - [Automated Backups](#automated-backups)
     - [Amazon Web Services (AWS) Remote Backups](#amazon-web-services-aws-remote-backups)
-    - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backup)
+    - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backups)
     - [Rake Tasks](#rake-tasks)
     - [Import Repositories](#import-repositories)
     - [Upgrading](#upgrading)
@@ -72,7 +72,7 @@
 
 ## Introduction
 
-Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform.
+Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) open source container platform.
 
 GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the official GitLab documentation.
 
@@ -599,11 +599,11 @@ The default path image is configured to look for the trusted SSL certificates is
 
 Copy the `ca.crt` file into the certs directory on the [datastore](#data-store). The `ca.crt` file should contain the root certificates of all the servers you want to trust. With respect to GitLab CI, this will be the contents of the gitlab_ci.crt file as described in the [README](https://github.com/sameersbn/docker-gitlab-ci/blob/master/README.md#ssl) of the [docker-gitlab-ci](https://github.com/sameersbn/docker-gitlab-ci) container.
 
-By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificate) is added to the trusted certificates list.
+By default, our own server certificate [gitlab.crt](#generation-of-a-self-signed-certificate) is added to the trusted certificates list.
 
 #### Deploy to a subdirectory (relative url root)
 
-By default, GitLab expects that your application is running at the root e.g.. /). This section explains how to run your application inside a directory.
+By default, GitLab expects that your application is running at the root (e.g.. /). This section explains how to run your application inside a directory.
 
 Let's assume we want to deploy our application to '/git'. GitLab needs to know this directory to generate the appropriate routes. This can be specified using the `GITLAB_RELATIVE_URL_ROOT` configuration option like so:
 
@@ -1876,7 +1876,7 @@ The database type. Currently only postgresql is supported. Possible values: `pos
 
 ##### `DB_ENCODING`
 
-The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively.
+The database encoding. For `DB_ADAPTER` values `postgresql` this parameter defaults and `utf8` respectively.
 
 ##### `DB_HOST`
 
@@ -1984,7 +1984,7 @@ Enable SSL. Defaults to `true`.
 
 ##### `IMAP_STARTTLS`
 
-Enable STARTSSL. Defaults to `false`.
+Enable STARTTLS. Defaults to `false`.
 
 ##### `IMAP_MAILBOX`
 
@@ -2528,7 +2528,7 @@ Sentry DSN. No defaults.
 
 ##### `SENTRY_CLIENTSIDE_DSN`
 
-Sentry clientside DSN. No defaults.
+Sentry client side DSN. No defaults.
 
 ##### `SENTRY_ENVIRONMENT`
 
@@ -2670,7 +2670,7 @@ docker run --name gitlab -it --rm [OPTIONS] \
     sameersbn/gitlab:18.0.2 app:rake gitlab:env:info
 ```
 
-You can also use `docker exec` to run raketasks on running gitlab instance. For example,
+You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
 
 ```bash
 docker exec --user git -it gitlab bundle exec rake gitlab:env:info RAILS_ENV=production
@@ -2818,7 +2818,7 @@ services:
       start_period: 2m
 ```
 
-Then you will be able to consult the healthcheck log by executing:
+Then you will be able to consult the health check log by executing:
 
 ```bash
 docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq

From 7684af95f901c214f4af03895af908be07370968 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Tue, 17 Jun 2025 18:51:38 +0900
Subject: [PATCH 1054/1124] Docs: fix RACK_ATTACK_WHITELIST section (quoting)

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0480e3d75..d0d2f5039 100644
--- a/README.md
+++ b/README.md
@@ -2490,14 +2490,14 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul
 
 Always allow requests from whitelisted host.
 This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail.
-If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below:
+If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example.
 
 ````yaml
 environment:
-# pattern 1: surround with single quote, double quote each IP address
-- RACK_ATTACK_WHITELIST='["1.1.1.1","192.168.0.0/24"]'
-# pattern 2: surround with double quote, single quote each IP address
-- RACK_ATTACK_WHITELIST="['1.1.1.1','192.168.0.0/24']"
+# pattern 1: `- key=value` style : you can specify array of hosts as is
+- RACK_ATTACK_WHITELIST=["1.1.1.1","192.168.0.0/24"]
+# pattern 2: `key: value` style : you must surround with quote, as the value of environment variable must not be an array
+  RACK_ATTACK_WHITELIST: "['1.1.1.1','192.168.0.0/24']"
 ````
 
 Defaults to `["127.0.0.1"]`

From ac47124a0dd410036468fef94090548b61345625 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Fri, 30 May 2025 19:41:01 +0900
Subject: [PATCH 1055/1124] Allow setting ActiveRecord encryption secrets

Add environment variable to set entry in secrets.yml related to
active record encryption

- active_record_encryption_primary_key (can be multiple)
- active_record_encryption_deterministic_key (can be multiple)
- active_record_encryption_key_derivation_salt

Reference for '32 characters length' recommendation:
https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/config/initializers/2_secret_token.rb#L78-80

TODO: fix command line usage in documentation
---
 README.md                                  | 28 ++++++++++++++++++++++
 assets/runtime/config/gitlabhq/secrets.yml |  3 +++
 assets/runtime/env-defaults                |  5 ++++
 assets/runtime/functions                   |  5 +++-
 contrib/docker-swarm/docker-compose.yml    |  3 +++
 docker-compose.swarm.yml                   |  3 +++
 docker-compose.yml                         |  3 +++
 kubernetes/gitlab-rc.yml                   |  6 +++++
 8 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0480e3d75..97a2b91af 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,8 @@ Generate random strings that are at least `64` characters long for each of `GITL
 
 > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`.
 
+Also generate random strings that are typically `32` characters long for each of `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`, `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. These values are used for `ActiveRecord::Encryption` encrypted columns.
+
 Start GitLab using:
 
 ```bash
@@ -188,6 +190,8 @@ docker run --name gitlab-redis -d \
 
 Step 3. Launch the gitlab container
 
+TODO: fix and verify command line option to set newly created keys (especially primary_key and deterministic_key : they must be an array)
+
 ```bash
 docker run --name gitlab -d \
     --link gitlab-postgresql:postgresql --link gitlab-redis:redisio \
@@ -197,6 +201,9 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
+    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=long-and-random-alpha-numeric-string' \
+    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=long-and-random-alpha-numeric-string' \
+    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
     sameersbn/gitlab:18.0.2
 ```
@@ -923,6 +930,26 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte
 
  Encryption key for encrypted settings related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, encrypted settings will not work and might cause errors in merge requests and so on** You can generate one using `pwgen -Bsv1 64`. No defaults.
 
+##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`
+
+The base key to non-deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_primary_key` in config/secrets.yml.  
+Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
+If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value.  
+No defaults.
+
+##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY`
+
+The base key to deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_deterministic_key` in config/secrets.yml.  
+Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
+If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value.  
+No defaults.
+
+##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`
+
+The derivation salt to encrypt data for ActiveRecord::Encryption encrypted columns. It can be used to set value for `active_record_encryption_key_derivation_salt` in config/secrets.yml.  
+Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
+No defaults.
+
 ##### `GITLAB_TIMEZONE`
 
 Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will affect cron, see variable `TZ`
@@ -2771,6 +2798,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
+> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml` and result to unusable stage of some features such as dependency proxy.
 
 ```bash
 docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2
diff --git a/assets/runtime/config/gitlabhq/secrets.yml b/assets/runtime/config/gitlabhq/secrets.yml
index eae882dca..0bcdde2b9 100644
--- a/assets/runtime/config/gitlabhq/secrets.yml
+++ b/assets/runtime/config/gitlabhq/secrets.yml
@@ -7,6 +7,9 @@ production:
   secret_key_base: {{GITLAB_SECRETS_SECRET_KEY_BASE}}
   otp_key_base: {{GITLAB_SECRETS_OTP_KEY_BASE}}
   encrypted_settings_key_base: {{GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE}}
+  active_record_encryption_primary_key: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY}}
+  active_record_encryption_deterministic_key: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY}}
+  active_record_encryption_key_derivation_salt: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT}}
 
 development:
   db_key_base: development
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 14e0ccc16..97d9c18fc 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -251,10 +251,15 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_UPLOADS
 GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false}
 GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com}
 
+# secrets
 GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-}
 GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-}
 GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-}
 GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=${GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE:-}
+GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY:-}
+GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY:-}
+GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT:-}
+
 GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
 GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
 
diff --git a/assets/runtime/functions b/assets/runtime/functions
index de90c30a2..20bb8ca7f 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -888,7 +888,10 @@ gitlab_configure_secrets() {
   GITLAB_SECRETS_DB_KEY_BASE \
   GITLAB_SECRETS_SECRET_KEY_BASE \
   GITLAB_SECRETS_OTP_KEY_BASE \
-  GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE
+  GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE \
+  GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY \
+  GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY \
+  GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
 
   local shell_secret="${GITLAB_INSTALL_DIR}/.gitlab_shell_secret"
   if [[ ! -f "${shell_secret}" ]]; then
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f9bc27e0a..f1a618a83 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -60,6 +60,9 @@ services:
       - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string
 
       - GITLAB_ROOT_PASSWORD=
       - GITLAB_ROOT_EMAIL=
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 422bcfd76..b3089a40c 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -123,6 +123,9 @@ services:
       - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string
 
       - GITLAB_ROOT_PASSWORD=
       - GITLAB_ROOT_EMAIL=
diff --git a/docker-compose.yml b/docker-compose.yml
index 6383371ab..4fca22b9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,6 +62,9 @@ services:
       - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string
       - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"]
+      - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string
 
       - GITLAB_ROOT_PASSWORD=
       - GITLAB_ROOT_EMAIL=
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index be10cd2c9..24b759e82 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -29,6 +29,12 @@ spec:
           value: long-and-random-alpha-numeric-string
         - name: GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE
           value: long-and-random-alpha-numeric-string
+        - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+          value: '[long-and-random-alpha-numeric-string]'
+        - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+          value: '[long-and-random-alpha-numeric-string]'
+        - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          value: long-and-random-alpha-numeric-string
 
         - name: GITLAB_ROOT_PASSWORD
           value:

From 822a21e5e4a071a19d9bdfb27d749a956c0fe6fe Mon Sep 17 00:00:00 2001
From: Joerg Stoever <stoever@dtv-verkehrsconsult.de>
Date: Thu, 12 Jun 2025 15:15:21 +0200
Subject: [PATCH 1056/1124] Some minor fixes to spelling and formatting

---
 README.md | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 97a2b91af..3b16951f8 100644
--- a/README.md
+++ b/README.md
@@ -159,7 +159,13 @@ Generate random strings that are at least `64` characters long for each of `GITL
 
 > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`.
 
-Also generate random strings that are typically `32` characters long for each of `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`, `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. These values are used for `ActiveRecord::Encryption` encrypted columns.
+Also generate random strings that are typically `32` characters long for each of:
+
+- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`
+- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY`
+- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`
+
+These values are used for `ActiveRecord::Encryption` encrypted columns. Details can be found under [Active Record Encryption](https://guides.rubyonrails.org/active_record_encryption.html).
 
 Start GitLab using:
 
@@ -190,8 +196,6 @@ docker run --name gitlab-redis -d \
 
 Step 3. Launch the gitlab container
 
-TODO: fix and verify command line option to set newly created keys (especially primary_key and deterministic_key : they must be an array)
-
 ```bash
 docker run --name gitlab -d \
     --link gitlab-postgresql:postgresql --link gitlab-redis:redisio \
@@ -201,8 +205,8 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
     --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
-    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=long-and-random-alpha-numeric-string' \
-    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=long-and-random-alpha-numeric-string' \
+    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alpha-numeric-string"]' \
+    --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
     sameersbn/gitlab:18.0.2
@@ -932,23 +936,15 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte
 
 ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`
 
-The base key to non-deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_primary_key` in config/secrets.yml.  
-Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
-If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value.  
-No defaults.
+The base key used to encrypt data for non-deterministic `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_primary_key` in `config/secrets.yml`. Ensure that your key is an alphanumeric string. Preferred to be 32 characters long. If you need to set multiple keys, set this parameter in the format `["first_primary_key","second_primary_key"]`. In `docker-compose.yml`, the value must NOT have additional quotes! **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults.
 
 ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY`
 
-The base key to deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_deterministic_key` in config/secrets.yml.  
-Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
-If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value.  
-No defaults.
+The base key used to encrypt data for deterministic `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_deterministic_key` in `config/secrets.yml`. Ensure that your key is an alphanumeric string. Preferred to be 32 characters long. If you need to set multiple keys, set this parameter in the format `["first_deterministic_key","second_deterministic_key"]`. In `docker-compose.yml`, the value must NOT have additional quotes! **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults.
 
 ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`
 
-The derivation salt to encrypt data for ActiveRecord::Encryption encrypted columns. It can be used to set value for `active_record_encryption_key_derivation_salt` in config/secrets.yml.  
-Ensure that your key is alphanumeric string. Preferred to be 32 characters long.  
-No defaults.
+The salt used to encrypt data for `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_key_derivation_salt` in `config/secrets.yml`. Ensure that your salt is an alphanumeric string. Preferred to be 32 characters long. **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults.
 
 ##### `GITLAB_TIMEZONE`
 
@@ -2796,9 +2792,12 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 - **Step 4**: Start the image
 
 > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
+
 > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
+
 > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image.  If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.
-> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml` and result to unusable stage of some features such as dependency proxy.
+
+> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
 docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2

From e910e3024c376872ffdb8f115d970c78a642120d Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 16 Jan 2025 17:51:35 +0900
Subject: [PATCH 1057/1124] Stop recompiling assets to enable relative url

As a result, an Internet connection is no longer required
to use relative URLs.

To enable relative url, we execute `gitlab:assets:compile`.
This have been removed in official documentation in v10.0.0
(first committed to gitlab-foss, then ported to gitlab(-ee))
- EE: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1139/
- CE: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8831

An internet connection was required when enabling relative urls
to install the node modules required for compilation.
I reviewed the rake task `gitlab:assets:compile` and investigated
whether it was necessary to compile all assets
just because the relative url changed,
and found that this rake task is internally a separate rake task
`gitlab:assets :fix_urls` which rewrite the reference URL in the css.

I removed rake task `gitlab:assets:compile` at runtime
and confirmed that the gitlab application worked normally as before.
I have confirmed that at least the following functions work properly.
- Administrator password reset at first login
- Create empty project
- Edit/add and commit files using web IDE
- Create merge request/issue
- Attach files to comments
- Create empty group
- Move existing project to group

In addition, we no longer need to do following things
- persist node_modules, recompiled assets and caches
- apply patches to gitlab itself to avoid removing (symlink to) node_modules/

This change also reduces startup time in certain cases
when the relative URL feature is enabled
(when assets are compiled; for example,
when performing a version upgrade or changing the relative URL)
(on my environment, `gitlab:assets:fix_urls` took about 20 seconds)
---
 Dockerfile                                    |  2 +-
 ...avoid-removing-node_modules_dir.patch.bak} |  0
 ...-raketask-gitlab-assets-compile.patch.bak} |  0
 assets/runtime/functions                      | 32 -------------------
 4 files changed, 1 insertion(+), 33 deletions(-)
 rename assets/build/patches/gitlabhq/{0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch => 0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak} (100%)
 rename assets/build/patches/gitlabhq/{0004-fix-raketask-gitlab-assets-compile.patch => 0004-fix-raketask-gitlab-assets-compile.patch.bak} (100%)

diff --git a/Dockerfile b/Dockerfile
index ebf602577..db9a17ff9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,7 +84,7 @@ LABEL \
 
 EXPOSE 22/tcp 80/tcp 443/tcp
 
-VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"]
+VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"]
 WORKDIR ${GITLAB_INSTALL_DIR}
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 CMD ["app:start"]
diff --git a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak
similarity index 100%
rename from assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch
rename to assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak
diff --git a/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak
similarity index 100%
rename from assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch
rename to assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak
diff --git a/assets/runtime/functions b/assets/runtime/functions
index de90c30a2..31da143cb 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1756,25 +1756,6 @@ initialize_datadir() {
   chmod 700 ${GITLAB_DATA_DIR}/.ssh
   chmod 600 ${GITLAB_DATA_DIR}/.ssh/authorized_keys
   chown -R ${GITLAB_USER}: ${GITLAB_DATA_DIR}/.ssh
-
-  # recompile and persist assets when relative_url is in use
-  if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
-    mkdir -p ${GITLAB_TEMP_DIR}/cache
-    chmod 755 ${GITLAB_TEMP_DIR}/cache
-    chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/cache
-
-    mkdir -p ${GITLAB_TEMP_DIR}/assets
-    chmod 755 ${GITLAB_TEMP_DIR}/assets
-    chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/assets
-
-    # symlink ${GITLAB_INSTALL_DIR}/tmp/cache -> ${GITLAB_TEMP_DIR}/cache
-    rm -rf ${GITLAB_INSTALL_DIR}/tmp/cache
-    exec_as_git ln -s ${GITLAB_TEMP_DIR}/cache ${GITLAB_INSTALL_DIR}/tmp/cache
-
-    # symlink ${GITLAB_INSTALL_DIR}/public/assets -> ${GITLAB_TEMP_DIR}/assets
-    rm -rf ${GITLAB_INSTALL_DIR}/public/assets
-    exec_as_git ln -s ${GITLAB_TEMP_DIR}/assets ${GITLAB_INSTALL_DIR}/public/assets
-  fi
 }
 
 sanitize_datadir() {
@@ -2250,19 +2231,6 @@ migrate_database() {
   # clear cache if relative_url has changed.
   [[ -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT ]] && CACHE_GITLAB_RELATIVE_URL_ROOT=$(cat ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT)
   if [[ ! -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT || ${GITLAB_RELATIVE_URL_ROOT} != ${CACHE_GITLAB_RELATIVE_URL_ROOT} ]]; then
-    # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used
-    if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then
-      if [[ ! -d ${GITLAB_HOME}/gitlab/node_modules ]]; then
-        mkdir -p ${GITLAB_HOME}/gitlab/node_modules
-        chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
-      fi
-      echo "Prepare recompile assets... Installing missing node_modules for assets"
-      chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules
-      exec_as_git yarn install --production --pure-lockfile
-      echo "Recompiling assets (relative_url in use), this could take a while..."
-      exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1
-    fi
-
     echo "Clearing cache..."
     exec_as_git bundle exec rake cache:clear >/dev/null 2>&1
     echo "${GITLAB_RELATIVE_URL_ROOT}" > ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT

From c742614eef9aea35f84070a6fadd9a62661d0b0f Mon Sep 17 00:00:00 2001
From: ysicing <i@ysicing.me>
Date: Wed, 18 Jun 2025 17:24:45 +0800
Subject: [PATCH 1058/1124] feat: Add support for Omniauth JWT login

---
 README.md                                 | 22 ++++++++++++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml | 13 +++++++++++--
 assets/runtime/env-defaults               | 11 +++++++++++
 assets/runtime/functions                  | 23 ++++++++++++++++++++++-
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0480e3d75..d025f7515 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@
         - [Microsoft Azure](#microsoft-azure)
         - [Generic OAuth2](#Generic-OAuth2)
         - [OpenID Connect](#openid-connect)
+        - [JWT](#jwt)
     - [Gitlab Pages](#gitlab-pages)
     - [External Issue Trackers](#external-issue-trackers)
     - [Host UID / GID Mapping](#host-uid--gid-mapping)
@@ -756,6 +757,27 @@ To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`.
 
 See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/).
 
+##### JWT
+
+To enable the JWT OmniAuth provider, you must register your application with JWT. JWT provides you with a secret key for you to use.
+
+To use JWT set at least `OAUTH_JWT_SECRET` and `OAUTH_JWT_AUTH_URL`.
+
+| GitLab setting                 | environment variable                | default value                  |
+| ------------------------------ | ----------------------------------- | -------------------------------|
+| `label`                        | `OAUTH_JWT_LABEL`                   | `Jwt`                          |
+| `secret`                       | `OAUTH_JWT_SECRET`                  |                                |
+| `algorithm`                    | `OAUTH_JWT_ALGORITHM`               | `HS256`                        |
+| `uid_claim`                    | `OAUTH_JWT_UID_CLAIM`               | `email`                        |
+| `required_claims`              | `OAUTH_JWT_REQUIRED_CLAIMS`         | `["name", "email"]`            |
+| `info_map.name`                | `OAUTH_JWT_INFO_MAP_NAME`           | `name`                         |
+| `info_map.email`               | `OAUTH_JWT_INFO_MAP_EMAIL`          | `email`                        |
+| `auth_url`                     | `OAUTH_JWT_AUTH_URL`                |                                |
+| `valid_within`                 | `OAUTH_JWT_VALID_WITHIN`            | `3600`                         |
+
+
+See [OmniAuth JWT documentation](https://docs.gitlab.com/administration/auth/jwt/).
+
 #### Gitlab Pages
 
 Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the environment variable `GITLAB_PAGES_ENABLED` to `true`.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index f828dd6f5..9d562de66 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -937,7 +937,7 @@ production: &base
                   login_url: '{{OAUTH_CAS3_LOGIN_URL}}',
                   service_validate_url: '{{OAUTH_CAS3_VALIDATE_URL}}',
                   logout_url: '{{OAUTH_CAS3_LOGOUT_URL}}'} }
-       - { name: 'authentiq',
+      - { name: 'authentiq',
           app_id: '{{OAUTH_AUTHENTIQ_CLIENT_ID}}',
           app_secret: 'OAUTH_AUTHENTIQ_CLIENT_SECRET',
           args: { scope: {{OAUTH_AUTHENTIQ_SCOPE}}, redirect_uri: '{{OAUTH_AUTHENTIQ_REDIRECT_URI}}' } }
@@ -1048,7 +1048,16 @@ production: &base
               identifier: '{{OAUTH_OIDC_CLIENT_ID}}',
               secret: '{{OAUTH_OIDC_CLIENT_SECRET}}',
               redirect_uri: '{{OAUTH_OIDC_REDIRECT_URI}}' } } }
-
+      - { name: 'jwt',
+          label: '{{OAUTH_JWT_LABEL}}',
+          args: {
+            secret: '{{OAUTH_JWT_SECRET}}',
+            algorithm: '{{OAUTH_JWT_ALGORITHM}}',
+            uid_claim: '{{OAUTH_JWT_UID_CLAIM}}',
+            required_claims: {{OAUTH_JWT_REQUIRED_CLAIMS}},
+            info_map: { name: '{{OAUTH_JWT_INFO_MAP_NAME}}', email: '{{OAUTH_JWT_INFO_MAP_EMAIL}}' },
+            auth_url: '{{OAUTH_JWT_AUTH_URL}}',
+            valid_within: {{OAUTH_JWT_VALID_WITHIN}} } }
     # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
     # cas3:
     #   session_duration: 28800
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 14e0ccc16..c2f62ba9c 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -559,6 +559,17 @@ case $GITLAB_HTTPS in
     ;;
 esac
 
+### JWT
+OAUTH_JWT_LABEL=${OAUTH_JWT_LABEL:-'Jwt'}
+OAUTH_JWT_SECRET=${OAUTH_JWT_SECRET:-}
+OAUTH_JWT_ALGORITHM=${OAUTH_JWT_ALGORITHM:-'HS256'}
+OAUTH_JWT_UID_CLAIM=${OAUTH_JWT_UID_CLAIM:-'email'}
+OAUTH_JWT_REQUIRED_CLAIMS=${OAUTH_JWT_REQUIRED_CLAIMS:-'["name", "email"]'}
+OAUTH_JWT_INFO_MAP_NAME=${OAUTH_JWT_INFO_MAP_NAME:-'name'}
+OAUTH_JWT_INFO_MAP_EMAIL=${OAUTH_JWT_INFO_MAP_EMAIL:-'email'}
+OAUTH_JWT_AUTH_URL=${OAUTH_JWT_AUTH_URL:-}
+OAUTH_JWT_VALID_WITHIN=${OAUTH_JWT_VALID_WITHIN:-3600}
+
 ## ANALYTICS
 
 ### GOOGLE
diff --git a/assets/runtime/functions b/assets/runtime/functions
index de90c30a2..f65f7789d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -821,6 +821,26 @@ gitlab_configure_oauth_oidc() {
   fi
 }
 
+gitlab_configure_oauth_jwt() {
+  if [[ -n ${OAUTH_JWT_SECRET} && \
+        -n ${OAUTH_JWT_AUTH_URL} ]]; then
+    echo "Configuring gitlab::oauth::jwt..."
+    OAUTH_ENABLED=${OAUTH_ENABLED:-true}
+    update_template ${GITLAB_CONFIG} \
+      OAUTH_JWT_LABEL \
+      OAUTH_JWT_SECRET \
+      OAUTH_JWT_ALGORITHM \
+      OAUTH_JWT_UID_CLAIM \
+      OAUTH_JWT_REQUIRED_CLAIMS \
+      OAUTH_JWT_INFO_MAP_NAME \
+      OAUTH_JWT_INFO_MAP_EMAIL \
+      OAUTH_JWT_AUTH_URL \
+      OAUTH_JWT_VALID_WITHIN
+  else
+    exec_as_git sed -i "/name: 'jwt'/,/{{OAUTH_JWT_VALID_WITHIN}}/d" ${GITLAB_CONFIG}
+  fi
+}
+
 gitlab_configure_oauth() {
   echo "Configuring gitlab::oauth..."
 
@@ -839,6 +859,7 @@ gitlab_configure_oauth() {
   gitlab_configure_oauth_azure
   gitlab_configure_oauth_azure_ad_v2
   gitlab_configure_oauth_oidc
+  gitlab_configure_oauth_jwt
 
   OAUTH_ENABLED=${OAUTH_ENABLED:-false}
   update_template ${GITLAB_CONFIG} \
@@ -852,7 +873,7 @@ gitlab_configure_oauth() {
     OAUTH_ALLOW_BYPASS_TWO_FACTOR
 
   case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in
-    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc)
+    cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc|jwt)
       update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER
       ;;
     *)

From e9575e47e8c4b696a945cfca6c4da53b53939e32 Mon Sep 17 00:00:00 2001
From: mixxtor <113852548+mixxtor@users.noreply.github.com>
Date: Thu, 19 Jun 2025 12:14:55 +0700
Subject: [PATCH 1059/1124] docs: Fix required PostgreSQL version for GitLab
 18.0.0 (was 18.0.2)

Updated the documentation to correctly reflect that GitLab 18.0.0 requires PostgreSQL 16.x, not 18.0.2 as previously stated.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8fed21b82..47e8f90c8 100644
--- a/README.md
+++ b/README.md
@@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there.
 > - As of version 13.7.0, the required PostgreSQL version is 12.x.
 > - As of version 16.0.0, the required PostgreSQL version is 13.x.
 > - As of version 17.0.0, the required PostgreSQL version is 14.x.
-> - As of version 18.0.2, the required PostgreSQL version is 16.x.
+> - As of version 18.0.0, the required PostgreSQL version is 16.x.
 >
 > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
 

From 82ba5b8c35a8c11d214cb1b56bc4ffc1d6ed3475 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 Jun 2025 20:02:01 +0200
Subject: [PATCH 1060/1124] Upgrade GitLab CE to 18.1.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 56 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e4e54153b..3cd55bf95 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.1.0
+
+- gitlab: upgrade CE to v18.1.0
+- gitaly: upgrade to v18.1.0
+- gitlab-pages: upgrade to v18.1.0
+
 ## 18.0.2
 
 - gitlab: upgrade CE to v18.0.2
diff --git a/Dockerfile b/Dockerfile
index db9a17ff9..9dc487a5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20250529
 
-ARG VERSION=18.0.2
+ARG VERSION=18.1.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.6.9 \
     GOLANG_VERSION=1.24.4 \
     GITLAB_SHELL_VERSION=14.42.0 \
-    GITLAB_PAGES_VERSION=18.0.2 \
-    GITALY_SERVER_VERSION=18.0.2 \
+    GITLAB_PAGES_VERSION=18.1.0 \
+    GITALY_SERVER_VERSION=18.1.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b3c62e602..0e6311e04 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.0.2
+# sameersbn/gitlab:18.1.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.2
+docker pull sameersbn/gitlab:18.1.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 ### Database
@@ -286,7 +286,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
 - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
 - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
-- GitLab CE version 18.0.2 and later requires PostgreSQL version 16.x.
+- GitLab CE version 18.1.0 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.0.2
+ sameersbn/gitlab:18.1.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.0.2
+    sameersbn/gitlab:18.1.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:sanitize
+    sameersbn/gitlab:18.1.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake db:setup
+    sameersbn/gitlab:18.1.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.1.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.0.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.2
+docker pull sameersbn/gitlab:18.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3d5ab6e54..d4df1049f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.2
+18.1.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f1a618a83..d2cef8f79 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b3089a40c..683de5888 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fca22b9c..6aae35f20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4dc45ab24..e42f35c23 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.0.2
+docker pull sameersbn/gitlab:18.1.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.0.2
+sameersbn/gitlab:18.1.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index d2cecf6b6..693d8cc56 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d56c880c5..f0e174a58 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.0.2
+    image: sameersbn/gitlab:18.1.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 24b759e82..73ac4b9ec 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.0.2
+        image: sameersbn/gitlab:18.1.0
         env:
         - name: TZ
           value: Asia/Kolkata

From a92ff33d2ea52e8c41b004e62918a2c193db6157 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 19 Jun 2025 21:08:10 +0200
Subject: [PATCH 1061/1124] docs: Fix required version for GitLab 18 with
 respect to PostgreSQL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e6311e04..9eb955b00 100644
--- a/README.md
+++ b/README.md
@@ -286,7 +286,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client
 - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x.
 - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x.
 - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x.
-- GitLab CE version 18.1.0 and later requires PostgreSQL version 16.x.
+- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x.
 
 ##### External PostgreSQL Server
 

From 1d6fff4af668563aa921f043fd00498fc92b726b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Jun 2025 19:15:57 +0200
Subject: [PATCH 1062/1124] Upgrade GitLab CE to 18.1.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3cd55bf95..d7612768e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.1.1
+
+- gitlab: upgrade CE to v18.1.1
+- gitaly: upgrade to v18.1.1
+- gitlab-pages: upgrade to v18.1.1
+
 ## 18.1.0
 
 - gitlab: upgrade CE to v18.1.0
diff --git a/Dockerfile b/Dockerfile
index 9dc487a5f..567f19739 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20250529
 
-ARG VERSION=18.1.0
+ARG VERSION=18.1.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.6.9 \
     GOLANG_VERSION=1.24.4 \
     GITLAB_SHELL_VERSION=14.42.0 \
-    GITLAB_PAGES_VERSION=18.1.0 \
-    GITALY_SERVER_VERSION=18.1.0 \
+    GITLAB_PAGES_VERSION=18.1.1 \
+    GITALY_SERVER_VERSION=18.1.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9eb955b00..fab0df345 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.1.0
+# sameersbn/gitlab:18.1.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.0
+docker pull sameersbn/gitlab:18.1.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.1.0
+ sameersbn/gitlab:18.1.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.1.0
+    sameersbn/gitlab:18.1.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:sanitize
+    sameersbn/gitlab:18.1.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake db:setup
+    sameersbn/gitlab:18.1.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.1.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.1.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.0
+docker pull sameersbn/gitlab:18.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d4df1049f..e8b385790 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.0
+18.1.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index d2cef8f79..6027ee004 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 683de5888..06b0872eb 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6aae35f20..e13084aab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e42f35c23..1af95a932 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.0
+docker pull sameersbn/gitlab:18.1.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.1.0
+sameersbn/gitlab:18.1.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 693d8cc56..82e294b40 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f0e174a58..f9cd0de7f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.0
+    image: sameersbn/gitlab:18.1.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 73ac4b9ec..f7fe88894 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.1.0
+        image: sameersbn/gitlab:18.1.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 92b639b1fa243cf8ad0f4fa1c2371ff04ceccabd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 9 Jul 2025 19:00:10 +0300
Subject: [PATCH 1063/1124] Upgrade GitLab CE to 18.1.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d7612768e..6dceffbbd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.1.2
+
+- gitlab: upgrade CE to v18.1.2
+- gitaly: upgrade to v18.1.2
+- gitlab-pages: upgrade to v18.1.2
+- golang: upgrade to v1.24.5
+- ubuntu: upgrade to noble-20250619
+
 ## 18.1.1
 
 - gitlab: upgrade CE to v18.1.1
diff --git a/Dockerfile b/Dockerfile
index 567f19739..789fb6171 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250529
+FROM ubuntu:noble-20250619
 
-ARG VERSION=18.1.1
+ARG VERSION=18.1.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
     RUBYGEMS_VERSION=3.6.9 \
-    GOLANG_VERSION=1.24.4 \
+    GOLANG_VERSION=1.24.5 \
     GITLAB_SHELL_VERSION=14.42.0 \
-    GITLAB_PAGES_VERSION=18.1.1 \
-    GITALY_SERVER_VERSION=18.1.1 \
+    GITLAB_PAGES_VERSION=18.1.2 \
+    GITALY_SERVER_VERSION=18.1.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index fab0df345..0837ca8a1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.1.1
+# sameersbn/gitlab:18.1.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.1
+docker pull sameersbn/gitlab:18.1.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.1.1
+ sameersbn/gitlab:18.1.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.1.1
+    sameersbn/gitlab:18.1.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:sanitize
+    sameersbn/gitlab:18.1.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake db:setup
+    sameersbn/gitlab:18.1.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.1.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.1.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.1
+docker pull sameersbn/gitlab:18.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e8b385790..4fa4aa5e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.1
+18.1.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 6027ee004..0e61a0078 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 06b0872eb..451f72730 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e13084aab..91c957374 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1af95a932..a254b8d81 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.1
+docker pull sameersbn/gitlab:18.1.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.1.1
+sameersbn/gitlab:18.1.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 82e294b40..f412fd49c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f9cd0de7f..71f930b64 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.1
+    image: sameersbn/gitlab:18.1.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f7fe88894..1255e6b28 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.1.1
+        image: sameersbn/gitlab:18.1.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 7cd573737f514b280c129a3b86dd660524947162 Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Mon, 2 Dec 2024 20:03:51 +0900
Subject: [PATCH 1064/1124] Remove `bundle install` for gitlab-shell

---
 assets/build/install.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index c6829e834..27c5dafb2 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -125,9 +125,6 @@ cd ${GITLAB_SHELL_INSTALL_DIR}
 exec_as_git cp -a config.yml.example config.yml
 
 echo "Compiling gitlab-shell golang executables..."
-exec_as_git bundle config set --local deployment 'true'
-exec_as_git bundle config set --local with 'development test'
-exec_as_git bundle install -j"$(nproc)"
 exec_as_git "PATH=$PATH" make verify setup
 
 # remove unused repositories directory created by gitlab-shell install

From d3141c3dc3780cdafcfec460fcb1d7d5cb97041b Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Thu, 3 Jul 2025 15:46:23 +0330
Subject: [PATCH 1065/1124] Use ed25519 in expose-gitlab-ssh-port.sh

---
 contrib/expose-gitlab-ssh-port.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/expose-gitlab-ssh-port.sh b/contrib/expose-gitlab-ssh-port.sh
index 51f5339ec..0211d27ea 100644
--- a/contrib/expose-gitlab-ssh-port.sh
+++ b/contrib/expose-gitlab-ssh-port.sh
@@ -10,15 +10,15 @@ if ! id -u git >> /dev/null 2>&1; then
 fi
 su git -c "mkdir -p /home/git/.ssh/"
 
-su git -c "if [ ! -f /home/git/.ssh/id_rsa ]; then ssh-keygen -t rsa -b 4096 -N \"\" -f /home/git/.ssh/id_rsa; fi"
-su git -c "if [ -f /home/git/.ssh/id_rsa.pub ]; then mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys_proxy; fi"
+su git -c "if [ ! -f /home/git/.ssh/id_ed25519 ]; then ssh-keygen -t ed25519 -N \"\" -f /home/git/.ssh/id_ed25519; fi"
+su git -c "if [ -f /home/git/.ssh/id_ed25519.pub ]; then mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys_proxy; fi"
 
 mkdir -p /home/git/gitlab-shell/bin/
 rm -f /home/git/gitlab-shell/bin/gitlab-shell
 tee -a /home/git/gitlab-shell/bin/gitlab-shell > /dev/null <<EOF
 #!/bin/sh
 
-ssh -i /home/git/.ssh/id_rsa -p ${GITLAB_SSH_PORT} -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"\$SSH_ORIGINAL_COMMAND\" \$0 \$@"
+ssh -i /home/git/.ssh/id_ed25519 -p ${GITLAB_SSH_PORT} -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"\$SSH_ORIGINAL_COMMAND\" \$0 \$@"
 EOF
 chown git:git /home/git/gitlab-shell/bin/gitlab-shell
 chmod u+x /home/git/gitlab-shell/bin/gitlab-shell

From d8aa15877d2e311cb9ca0dcf510e7d96bd095ea1 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 18 Jul 2025 14:43:03 +0200
Subject: [PATCH 1066/1124] Upgrade GitLab CE to 18.2.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6dceffbbd..ad4a048ab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.2.0
+
+- gitlab: upgrade CE to v18.2.0
+- gitaly: upgrade to v18.2.0
+- gitlab-pages: upgrade to v18.2.0
+- gitlab-shell: upgrade to v14.43.0
+- rubygems: upgrade to v3.7.0
+- ubuntu: upgrade to noble-20250714
+
 ## 18.1.2
 
 - gitlab: upgrade CE to v18.1.2
diff --git a/Dockerfile b/Dockerfile
index 789fb6171..8cbab9ea3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250619
+FROM ubuntu:noble-20250714
 
-ARG VERSION=18.1.2
+ARG VERSION=18.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.8 \
     RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
-    RUBYGEMS_VERSION=3.6.9 \
+    RUBYGEMS_VERSION=3.7.0 \
     GOLANG_VERSION=1.24.5 \
-    GITLAB_SHELL_VERSION=14.42.0 \
-    GITLAB_PAGES_VERSION=18.1.2 \
-    GITALY_SERVER_VERSION=18.1.2 \
+    GITLAB_SHELL_VERSION=14.43.0 \
+    GITLAB_PAGES_VERSION=18.2.0 \
+    GITALY_SERVER_VERSION=18.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 0837ca8a1..da355c109 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.1.2
+# sameersbn/gitlab:18.2.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.2
+docker pull sameersbn/gitlab:18.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.1.2
+ sameersbn/gitlab:18.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.1.2
+    sameersbn/gitlab:18.2.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:sanitize
+    sameersbn/gitlab:18.2.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake db:setup
+    sameersbn/gitlab:18.2.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.1.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.2
+docker pull sameersbn/gitlab:18.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4fa4aa5e7..08e3ca9b8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.2
+18.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 0e61a0078..06a41a689 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 451f72730..e86e18b45 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 91c957374..5dc089736 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a254b8d81..1e8b9d225 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.1.2
+docker pull sameersbn/gitlab:18.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.1.2
+sameersbn/gitlab:18.2.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f412fd49c..995443b85 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 71f930b64..c1f1f83d7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.1.2
+    image: sameersbn/gitlab:18.2.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 1255e6b28..7ef09f7f0 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.1.2
+        image: sameersbn/gitlab:18.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From a336dcd3c2ee420d8d2086a2f5d8039f1e6fbcbf Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Sat, 19 Jul 2025 00:42:42 +0900
Subject: [PATCH 1067/1124] CI: update executor for job `release` to go 1.24

from go 1.22

"go installl meterup/github-release" fails
as dependency (kevinburke/rest@v0.0.0) requires go >= 1.23.0)
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b23690010..10cf0a50a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -277,7 +277,7 @@ jobs:
   release:
     executor:
       name: go/default
-      tag: '1.22'
+      tag: '1.24'
     steps:
       - checkout
       - run:

From 2b91edb1e3918f3f169f3e7edf51cbf305658e0e Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 24 Jul 2025 15:52:10 +0200
Subject: [PATCH 1068/1124] Upgrade GitLab CE to 18.2.1

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ad4a048ab..bedbe4951 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.2.1
+
+- gitlab: upgrade CE to v18.2.1
+- gitaly: upgrade to v18.2.1
+- gitlab-pages: upgrade to v18.2.1
+- ruby: upgrade to v3.2.9
+- rubygems: upgrade to v3.7.1
+
 ## 18.2.0
 
 - gitlab: upgrade CE to v18.2.0
diff --git a/Dockerfile b/Dockerfile
index 8cbab9ea3..7dabe7e52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20250714
 
-ARG VERSION=18.2.0
+ARG VERSION=18.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.8 \
-    RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \
-    RUBYGEMS_VERSION=3.7.0 \
+    RUBY_VERSION=3.2.9 \
+    RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
+    RUBYGEMS_VERSION=3.7.1 \
     GOLANG_VERSION=1.24.5 \
     GITLAB_SHELL_VERSION=14.43.0 \
-    GITLAB_PAGES_VERSION=18.2.0 \
-    GITALY_SERVER_VERSION=18.2.0 \
+    GITLAB_PAGES_VERSION=18.2.1 \
+    GITALY_SERVER_VERSION=18.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index da355c109..d889d1554 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.2.0
+# sameersbn/gitlab:18.2.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.0
+docker pull sameersbn/gitlab:18.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.2.0
+ sameersbn/gitlab:18.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.2.0
+    sameersbn/gitlab:18.2.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:sanitize
+    sameersbn/gitlab:18.2.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake db:setup
+    sameersbn/gitlab:18.2.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.2.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.0
+docker pull sameersbn/gitlab:18.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 08e3ca9b8..c0aa6d4ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.2.0
+18.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 06a41a689..bf4aa1fcf 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e86e18b45..8ddb4059d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5dc089736..4393e4f58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1e8b9d225..7165b8682 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.0
+docker pull sameersbn/gitlab:18.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.2.0
+sameersbn/gitlab:18.2.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 995443b85..aa51a621a 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c1f1f83d7..c9d2c4cdc 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.0
+    image: sameersbn/gitlab:18.2.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 7ef09f7f0..38ce03ac9 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.2.0
+        image: sameersbn/gitlab:18.2.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 3c41556690dc81d89396fcdcdc33aefbb3c5dcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Br=C3=BCggemann?= <brueggemann@divera.gmbh>
Date: Thu, 14 Aug 2025 12:01:38 +0200
Subject: [PATCH 1069/1124] Upgrade GitLab CE to 18.2.2

---
 Changelog.md                     |  7 +++++
 Dockerfile                       |  8 ++---
 README.md                        | 54 ++++++++++++++++----------------
 VERSION                          |  2 +-
 docker-compose.swarm.yml         |  2 +-
 docker-compose.yml               |  2 +-
 docs/container_registry.md       | 10 +++---
 docs/docker-compose-keycloak.yml |  2 +-
 docs/docker-compose-registry.yml |  2 +-
 kubernetes/gitlab-rc.yml         |  2 +-
 10 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bedbe4951..a5573048c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.2.2
+
+- gitlab: upgrade CE to v18.2.2
+- gitaly: upgrade to v18.2.2
+- gitlab-pages: upgrade to v18.2.2
+- ubuntu: upgrade to noble-20250716
+
 ## 18.2.1
 
 - gitlab: upgrade CE to v18.2.1
diff --git a/Dockerfile b/Dockerfile
index 7dabe7e52..cbfcd2854 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:noble-20250714
+FROM ubuntu:noble-20250716
 
-ARG VERSION=18.2.1
+ARG VERSION=18.2.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.1 \
     GOLANG_VERSION=1.24.5 \
     GITLAB_SHELL_VERSION=14.43.0 \
-    GITLAB_PAGES_VERSION=18.2.1 \
-    GITALY_SERVER_VERSION=18.2.1 \
+    GITLAB_PAGES_VERSION=18.2.2 \
+    GITALY_SERVER_VERSION=18.2.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d889d1554..c88cfb854 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.2.1
+# sameersbn/gitlab:18.2.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.1
+docker pull sameersbn/gitlab:18.2.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.2.1
+ sameersbn/gitlab:18.2.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.2.1
+    sameersbn/gitlab:18.2.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:sanitize
+    sameersbn/gitlab:18.2.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake db:setup
+    sameersbn/gitlab:18.2.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.2.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.2.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.1
+docker pull sameersbn/gitlab:18.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index c0aa6d4ae..60ea50e40 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.2.1
+18.2.2
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8ddb4059d..634ae485f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4393e4f58..27f87fcd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 7165b8682..d669bbab5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.1
+docker pull sameersbn/gitlab:18.2.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.2.1
+sameersbn/gitlab:18.2.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index aa51a621a..198cf4b76 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c9d2c4cdc..99302d577 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 38ce03ac9..743e24941 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.2.1
+        image: sameersbn/gitlab:18.2.2
         env:
         - name: TZ
           value: Asia/Kolkata

From de19dee870551a5f7c819374e5917a0bc81f684b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 14 Aug 2025 21:08:52 +0200
Subject: [PATCH 1070/1124] Upgrade golang to v1.24.6

---
 Changelog.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a5573048c..dbdf2bc54 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab: upgrade CE to v18.2.2
 - gitaly: upgrade to v18.2.2
 - gitlab-pages: upgrade to v18.2.2
+- golang: upgrade to v1.24.6
 - ubuntu: upgrade to noble-20250716
 
 ## 18.2.1
diff --git a/Dockerfile b/Dockerfile
index cbfcd2854..bb3c1c948 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.1 \
-    GOLANG_VERSION=1.24.5 \
+    GOLANG_VERSION=1.24.6 \
     GITLAB_SHELL_VERSION=14.43.0 \
     GITLAB_PAGES_VERSION=18.2.2 \
     GITALY_SERVER_VERSION=18.2.2 \

From 272c868879cad1a487798369fbd4c91cd46c600b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 14 Aug 2025 21:09:23 +0200
Subject: [PATCH 1071/1124] Upgrade used image version for docker compose
 microservice

---
 contrib/docker-swarm/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index bf4aa1fcf..9aa3e37ac 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.1
+    image: sameersbn/gitlab:18.2.2
     depends_on:
       - redis
       - postgresql

From bcd81ae1fbcefd28438423872549fb681f337038 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 20 Aug 2025 04:51:10 +0200
Subject: [PATCH 1072/1124] Upgrade GitLab CE to 18.2.4

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dbdf2bc54..38474fa4f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.2.4
+
+- gitlab: upgrade CE to v18.2.4
+- gitaly: upgrade to v18.2.4
+- gitlab-pages: upgrade to v18.2.4
+- gitlab-shell: upgrade to v14.44.0
+
 ## 18.2.2
 
 - gitlab: upgrade CE to v18.2.2
diff --git a/Dockerfile b/Dockerfile
index bb3c1c948..bd1b0a69f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20250716
 
-ARG VERSION=18.2.2
+ARG VERSION=18.2.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.1 \
     GOLANG_VERSION=1.24.6 \
-    GITLAB_SHELL_VERSION=14.43.0 \
-    GITLAB_PAGES_VERSION=18.2.2 \
-    GITALY_SERVER_VERSION=18.2.2 \
+    GITLAB_SHELL_VERSION=14.44.0 \
+    GITLAB_PAGES_VERSION=18.2.4 \
+    GITALY_SERVER_VERSION=18.2.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c88cfb854..b0ead1c3c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.2.2
+# sameersbn/gitlab:18.2.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.2
+docker pull sameersbn/gitlab:18.2.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.2.2
+ sameersbn/gitlab:18.2.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.2.2
+    sameersbn/gitlab:18.2.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:sanitize
+    sameersbn/gitlab:18.2.4 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake db:setup
+    sameersbn/gitlab:18.2.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.2.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.2.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.2
+docker pull sameersbn/gitlab:18.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.4
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 60ea50e40..93d4fc0a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.2.2
+18.2.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 9aa3e37ac..aa0e6baea 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 634ae485f..4e930607f 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 27f87fcd0..ea129ce85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d669bbab5..c73bd58e5 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.2
+docker pull sameersbn/gitlab:18.2.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.2.2
+sameersbn/gitlab:18.2.4
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 198cf4b76..ee520f29b 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 99302d577..54c56f49e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.2
+    image: sameersbn/gitlab:18.2.4
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 743e24941..de4e40a28 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.2.2
+        image: sameersbn/gitlab:18.2.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 9ed7f75eaa49e34723c17c5e6c1335a8fba5f003 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 22 Aug 2025 00:36:07 +0200
Subject: [PATCH 1073/1124] Upgrade GitLab CE to 18.3.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 38474fa4f..8ba2422d5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.3.0
+
+- gitlab: upgrade CE to v18.3.0
+- gitaly: upgrade to v18.3.0
+- gitlab-pages: upgrade to v18.3.0
+
 ## 18.2.4
 
 - gitlab: upgrade CE to v18.2.4
diff --git a/Dockerfile b/Dockerfile
index bd1b0a69f..a9fe2c2c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20250716
 
-ARG VERSION=18.2.4
+ARG VERSION=18.3.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.1 \
     GOLANG_VERSION=1.24.6 \
     GITLAB_SHELL_VERSION=14.44.0 \
-    GITLAB_PAGES_VERSION=18.2.4 \
-    GITALY_SERVER_VERSION=18.2.4 \
+    GITLAB_PAGES_VERSION=18.3.0 \
+    GITALY_SERVER_VERSION=18.3.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b0ead1c3c..d3bad305a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.2.4
+# sameersbn/gitlab:18.3.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.4
+docker pull sameersbn/gitlab:18.3.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.2.4
+ sameersbn/gitlab:18.3.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.2.4
+    sameersbn/gitlab:18.3.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:sanitize
+    sameersbn/gitlab:18.3.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake db:setup
+    sameersbn/gitlab:18.3.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:env:info
+    sameersbn/gitlab:18.3.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.2.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.4
+docker pull sameersbn/gitlab:18.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 93d4fc0a5..ef9129a61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.2.4
+18.3.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index aa0e6baea..40df29f9a 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4e930607f..9099e57b0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ea129ce85..33089e7b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c73bd58e5..c8afc8a52 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.2.4
+docker pull sameersbn/gitlab:18.3.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.2.4
+sameersbn/gitlab:18.3.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index ee520f29b..bf9257977 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 54c56f49e..64568249d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.2.4
+    image: sameersbn/gitlab:18.3.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index de4e40a28..040149cd6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.2.4
+        image: sameersbn/gitlab:18.3.0
         env:
         - name: TZ
           value: Asia/Kolkata

From bcc0a731eb673912f688cd79ac2b3216c16cc65b Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 28 Aug 2025 21:42:59 +0200
Subject: [PATCH 1074/1124] Upgrade GitLab CE to 18.3.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8ba2422d5..a325375f6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.3.1
+
+- gitlab: upgrade CE to v18.3.1
+- gitaly: upgrade to v18.3.1
+- gitlab-pages: upgrade to v18.3.1
+
 ## 18.3.0
 
 - gitlab: upgrade CE to v18.3.0
diff --git a/Dockerfile b/Dockerfile
index a9fe2c2c9..f809e177e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20250716
 
-ARG VERSION=18.3.0
+ARG VERSION=18.3.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.1 \
     GOLANG_VERSION=1.24.6 \
     GITLAB_SHELL_VERSION=14.44.0 \
-    GITLAB_PAGES_VERSION=18.3.0 \
-    GITALY_SERVER_VERSION=18.3.0 \
+    GITLAB_PAGES_VERSION=18.3.1 \
+    GITALY_SERVER_VERSION=18.3.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d3bad305a..d79900a1a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.3.0
+# sameersbn/gitlab:18.3.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.0
+docker pull sameersbn/gitlab:18.3.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.3.0
+ sameersbn/gitlab:18.3.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.3.0
+    sameersbn/gitlab:18.3.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:sanitize
+    sameersbn/gitlab:18.3.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake db:setup
+    sameersbn/gitlab:18.3.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.3.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.3.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.0
+docker pull sameersbn/gitlab:18.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ef9129a61..217b5c6e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.3.0
+18.3.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 40df29f9a..b4b2cafa8 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9099e57b0..bb4b5653e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 33089e7b0..adee4e568 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index c8afc8a52..28175af3f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.0
+docker pull sameersbn/gitlab:18.3.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.3.0
+sameersbn/gitlab:18.3.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index bf9257977..70abc5c42 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 64568249d..c00caa6bf 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.0
+    image: sameersbn/gitlab:18.3.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 040149cd6..c0f1b3c8a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.3.0
+        image: sameersbn/gitlab:18.3.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 8076ab27ec26fcf9c4c4fdfd8fd8c08cd48d81aa Mon Sep 17 00:00:00 2001
From: Kazunori Kimura <norytama.k2@gmail.com>
Date: Thu, 26 Jun 2025 01:34:45 +0900
Subject: [PATCH 1075/1124] disable compiling source map to reduce build time

30min -> 20min on my old PC, 20min -> 10min on my new PC
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f809e177e..6c643e471 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ ENV GITLAB_VERSION=${VERSION} \
     GITLAB_LOG_DIR="/var/log/gitlab" \
     GITLAB_CACHE_DIR="/etc/docker-gitlab" \
     RAILS_ENV=production \
-    NODE_ENV=production
+    NODE_ENV=production \
+    NO_SOURCEMAPS=true
 
 ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \
     GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \

From f83d352ee60092abc702d63b084566b7c0c938ec Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 10 Sep 2025 20:04:58 +0200
Subject: [PATCH 1076/1124] Upgrade GitLab CE to 18.3.2

---
 Changelog.md                            | 10 +++++
 Dockerfile                              | 14 +++----
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a325375f6..a5e9266f0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,16 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.3.2
+
+- gitlab: upgrade CE to v18.3.2
+- gitaly: upgrade to v18.3.2
+- gitlab-pages: upgrade to v18.3.2
+- gitlab-shell: upgrade to v14.45.2
+- golang: upgrade to v1.24.7
+- rubygems: upgrade to v3.7.2
+- ubuntu: upgrade to noble-20250805
+
 ## 18.3.1
 
 - gitlab: upgrade CE to v18.3.1
diff --git a/Dockerfile b/Dockerfile
index 6c643e471..c47b21d42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250716
+FROM ubuntu:noble-20250805
 
-ARG VERSION=18.3.1
+ARG VERSION=18.3.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
-    RUBYGEMS_VERSION=3.7.1 \
-    GOLANG_VERSION=1.24.6 \
-    GITLAB_SHELL_VERSION=14.44.0 \
-    GITLAB_PAGES_VERSION=18.3.1 \
-    GITALY_SERVER_VERSION=18.3.1 \
+    RUBYGEMS_VERSION=3.7.2 \
+    GOLANG_VERSION=1.24.7 \
+    GITLAB_SHELL_VERSION=14.45.2 \
+    GITLAB_PAGES_VERSION=18.3.2 \
+    GITALY_SERVER_VERSION=18.3.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d79900a1a..c91a15a73 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.3.1
+# sameersbn/gitlab:18.3.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.1
+docker pull sameersbn/gitlab:18.3.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.3.1
+ sameersbn/gitlab:18.3.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.3.1
+    sameersbn/gitlab:18.3.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:sanitize
+    sameersbn/gitlab:18.3.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake db:setup
+    sameersbn/gitlab:18.3.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.3.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.3.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.1
+docker pull sameersbn/gitlab:18.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 217b5c6e8..a19b2d9a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.3.1
+18.3.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b4b2cafa8..e688dbe9b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index bb4b5653e..b8c3fcdd7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index adee4e568..273c6d082 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 28175af3f..cfbcba16b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.1
+docker pull sameersbn/gitlab:18.3.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.3.1
+sameersbn/gitlab:18.3.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 70abc5c42..e96ba6622 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c00caa6bf..aea22efba 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.1
+    image: sameersbn/gitlab:18.3.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c0f1b3c8a..df755fd5e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.3.1
+        image: sameersbn/gitlab:18.3.2
         env:
         - name: TZ
           value: Asia/Kolkata

From dee851eba25ef355fb90b68d3148e0918b26639a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 18 Sep 2025 19:02:09 +0200
Subject: [PATCH 1077/1124] Upgrade GitLab CE to 18.4.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a5e9266f0..5acac20c4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.4.0
+
+- gitlab: upgrade CE to v18.4.0
+- gitaly: upgrade to v18.4.0
+- gitlab-pages: upgrade to v18.4.0
+- ubuntu: upgrade to noble-20250910
+
 ## 18.3.2
 
 - gitlab: upgrade CE to v18.3.2
diff --git a/Dockerfile b/Dockerfile
index c47b21d42..7f34ec26e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:noble-20250805
+FROM ubuntu:noble-20250910
 
-ARG VERSION=18.3.2
+ARG VERSION=18.4.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.7 \
     GITLAB_SHELL_VERSION=14.45.2 \
-    GITLAB_PAGES_VERSION=18.3.2 \
-    GITALY_SERVER_VERSION=18.3.2 \
+    GITLAB_PAGES_VERSION=18.4.0 \
+    GITALY_SERVER_VERSION=18.4.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c91a15a73..187cf811e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.3.2
+# sameersbn/gitlab:18.4.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.2
+docker pull sameersbn/gitlab:18.4.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.3.2
+ sameersbn/gitlab:18.4.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.3.2
+    sameersbn/gitlab:18.4.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:sanitize
+    sameersbn/gitlab:18.4.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake db:setup
+    sameersbn/gitlab:18.4.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.4.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.3.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.2
+docker pull sameersbn/gitlab:18.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a19b2d9a0..5b9720f0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.3.2
+18.4.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e688dbe9b..723774b9b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b8c3fcdd7..4ab0e3b39 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 273c6d082..c19e074e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index cfbcba16b..4bad14b88 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.3.2
+docker pull sameersbn/gitlab:18.4.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.3.2
+sameersbn/gitlab:18.4.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e96ba6622..cc8a58343 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index aea22efba..4b4dcc656 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.3.2
+    image: sameersbn/gitlab:18.4.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index df755fd5e..c2bed5de1 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.3.2
+        image: sameersbn/gitlab:18.4.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 7048018305f508ca2716f888cd1814454984f4f2 Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Tue, 8 Jul 2025 11:53:27 +0900
Subject: [PATCH 1078/1124] Remove postgresql-contrib

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

diff --git a/Dockerfile b/Dockerfile
index 7f34ec26e..c1259134f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex && \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
-      nginx openssh-server postgresql-contrib redis-tools \
+      nginx openssh-server redis-tools \
       postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 postgresql-client-17 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \
       libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \

From a755d6d4562a6b99d6b7aed147abd4c3cb3149cb Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 26 Sep 2025 21:51:44 +0200
Subject: [PATCH 1079/1124] Upgrade GitLab CE to 18.4.1

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5acac20c4..400d5f002 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.4.1
+
+- gitlab: upgrade CE to v18.4.1
+- gitaly: upgrade to v18.4.1
+- gitlab-pages: upgrade to v18.4.1
+- ubuntu: upgrade to noble-20250910
+
 ## 18.4.0
 
 - gitlab: upgrade CE to v18.4.0
diff --git a/Dockerfile b/Dockerfile
index c1259134f..ecb6bfec5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20250910
 
-ARG VERSION=18.4.0
+ARG VERSION=18.4.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.7 \
     GITLAB_SHELL_VERSION=14.45.2 \
-    GITLAB_PAGES_VERSION=18.4.0 \
-    GITALY_SERVER_VERSION=18.4.0 \
+    GITLAB_PAGES_VERSION=18.4.1 \
+    GITALY_SERVER_VERSION=18.4.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 187cf811e..4ff1e3536 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.4.0
+# sameersbn/gitlab:18.4.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.0
+docker pull sameersbn/gitlab:18.4.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.4.0
+ sameersbn/gitlab:18.4.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.4.0
+    sameersbn/gitlab:18.4.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:sanitize
+    sameersbn/gitlab:18.4.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake db:setup
+    sameersbn/gitlab:18.4.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.4.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.4.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.0
+docker pull sameersbn/gitlab:18.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5b9720f0a..de473bd69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.4.0
+18.4.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 723774b9b..b90a45cb9 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 4ab0e3b39..a18491142 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index c19e074e3..a351fa9d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 4bad14b88..a2257b3e9 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.0
+docker pull sameersbn/gitlab:18.4.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.4.0
+sameersbn/gitlab:18.4.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index cc8a58343..42dfa5f72 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 4b4dcc656..475e8f54e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.0
+    image: sameersbn/gitlab:18.4.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c2bed5de1..b3e181dbf 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.4.0
+        image: sameersbn/gitlab:18.4.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 71467c1662e87b13fb9d53d1b69618160318c1a8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 9 Oct 2025 23:19:45 +0200
Subject: [PATCH 1080/1124] Upgrade GitLab CE to 18.4.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 400d5f002..158a49343 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.4.2
+
+- gitlab: upgrade CE to v18.4.2
+- gitaly: upgrade to v18.4.2
+- gitlab-pages: upgrade to v18.4.2
+- golang: upgrade to v1.24.8
+- ubuntu: upgrade to noble-20250925
+
 ## 18.4.1
 
 - gitlab: upgrade CE to v18.4.1
diff --git a/Dockerfile b/Dockerfile
index ecb6bfec5..ba96695c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250910
+FROM ubuntu:noble-20250925
 
-ARG VERSION=18.4.1
+ARG VERSION=18.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.7 \
+    GOLANG_VERSION=1.24.8 \
     GITLAB_SHELL_VERSION=14.45.2 \
-    GITLAB_PAGES_VERSION=18.4.1 \
-    GITALY_SERVER_VERSION=18.4.1 \
+    GITLAB_PAGES_VERSION=18.4.2 \
+    GITALY_SERVER_VERSION=18.4.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4ff1e3536..898f31f65 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.4.1
+# sameersbn/gitlab:18.4.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.1
+docker pull sameersbn/gitlab:18.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.4.1
+ sameersbn/gitlab:18.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.4.1
+    sameersbn/gitlab:18.4.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:sanitize
+    sameersbn/gitlab:18.4.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake db:setup
+    sameersbn/gitlab:18.4.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.4.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.1
+docker pull sameersbn/gitlab:18.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index de473bd69..e5096b2fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.4.1
+18.4.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b90a45cb9..c29280827 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a18491142..23d748942 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index a351fa9d4..1462276a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index a2257b3e9..81e03b696 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.1
+docker pull sameersbn/gitlab:18.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.4.1
+sameersbn/gitlab:18.4.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 42dfa5f72..f51ef5326 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 475e8f54e..7e461336e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.1
+    image: sameersbn/gitlab:18.4.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b3e181dbf..f22140208 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.4.1
+        image: sameersbn/gitlab:18.4.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 6909012b9a8e72ac2cc773c109c46e922a0ac66f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 17 Oct 2025 05:46:10 +0200
Subject: [PATCH 1081/1124] Upgrade GitLab CE to 18.5.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 158a49343..55965d954 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.5.0
+
+- gitlab: upgrade CE to v18.5.0
+- gitaly: upgrade to v18.5.0
+- gitlab-pages: upgrade to v18.5.0
+- gitlab-shell: upgrade to v14.45.3
+- golang: upgrade to v1.24.9
+- ubuntu: upgrade to noble-20251001
+
 ## 18.4.2
 
 - gitlab: upgrade CE to v18.4.2
diff --git a/Dockerfile b/Dockerfile
index ba96695c3..28c82f5c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250925
+FROM ubuntu:noble-20251001
 
-ARG VERSION=18.4.2
+ARG VERSION=18.5.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.8 \
-    GITLAB_SHELL_VERSION=14.45.2 \
-    GITLAB_PAGES_VERSION=18.4.2 \
-    GITALY_SERVER_VERSION=18.4.2 \
+    GOLANG_VERSION=1.24.9 \
+    GITLAB_SHELL_VERSION=14.45.3 \
+    GITLAB_PAGES_VERSION=18.5.0 \
+    GITALY_SERVER_VERSION=18.5.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 898f31f65..57b6f892d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.4.2
+# sameersbn/gitlab:18.5.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.2
+docker pull sameersbn/gitlab:18.5.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.4.2
+ sameersbn/gitlab:18.5.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.4.2
+    sameersbn/gitlab:18.5.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:sanitize
+    sameersbn/gitlab:18.5.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake db:setup
+    sameersbn/gitlab:18.5.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.5.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.4.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.2
+docker pull sameersbn/gitlab:18.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e5096b2fc..9020bd13e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.4.2
+18.5.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index c29280827..e342ed667 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 23d748942..9c2782af3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 1462276a1..2a52f0322 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 81e03b696..0c32030c8 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.4.2
+docker pull sameersbn/gitlab:18.5.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.4.2
+sameersbn/gitlab:18.5.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index f51ef5326..231d13b05 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 7e461336e..799b1e4a7 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.5.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f22140208..042152776 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.4.2
+        image: sameersbn/gitlab:18.5.0
         env:
         - name: TZ
           value: Asia/Kolkata

From c0f13725ff5d0699d9330ac6ee97abdb6c073aa8 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 17 Oct 2025 19:58:10 +0200
Subject: [PATCH 1082/1124] Update download URL for golang source code

---
 assets/build/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 27c5dafb2..817fd61cf 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -110,7 +110,7 @@ gem install bundler:"${BUNDLER_VERSION}"
 
 # download golang
 echo "Downloading Go ${GOLANG_VERSION}..."
-wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/
+wget -cnv https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/
 tar -xf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz -C /tmp/
 
 # install gitlab-shell

From e731a5899a54ef9faf0ff953369f5f5179f81f19 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Oct 2025 19:46:23 +0200
Subject: [PATCH 1083/1124] Upgrade GitLab CE to 18.5.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 55965d954..9d9654314 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.5.1
+
+- gitlab: upgrade CE to v18.5.1
+- gitaly: upgrade to v18.5.1
+- gitlab-pages: upgrade to v18.5.1
+
 ## 18.5.0
 
 - gitlab: upgrade CE to v18.5.0
diff --git a/Dockerfile b/Dockerfile
index 28c82f5c4..7712fb6be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20251001
 
-ARG VERSION=18.5.0
+ARG VERSION=18.5.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.9 \
     GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.5.0 \
-    GITALY_SERVER_VERSION=18.5.0 \
+    GITLAB_PAGES_VERSION=18.5.1 \
+    GITALY_SERVER_VERSION=18.5.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 57b6f892d..5ecf8e454 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.5.0
+# sameersbn/gitlab:18.5.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.0
+docker pull sameersbn/gitlab:18.5.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.5.0
+ sameersbn/gitlab:18.5.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.5.0
+    sameersbn/gitlab:18.5.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:sanitize
+    sameersbn/gitlab:18.5.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake db:setup
+    sameersbn/gitlab:18.5.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.5.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.5.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.0
+docker pull sameersbn/gitlab:18.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9020bd13e..82f73fb75 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.5.0
+18.5.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index e342ed667..97fe9d52e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9c2782af3..de799f1d0 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2a52f0322..9e9752f2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0c32030c8..d04f39a5b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.0
+docker pull sameersbn/gitlab:18.5.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.5.0
+sameersbn/gitlab:18.5.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 231d13b05..903ba799c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 799b1e4a7..24b75c8db 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.0
+    image: sameersbn/gitlab:18.5.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 042152776..e069a6814 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.5.0
+        image: sameersbn/gitlab:18.5.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 4c4fc65632b2d71fbe7c4056d37aae06fd4502f6 Mon Sep 17 00:00:00 2001
From: Thomas Hiller <thomas.hiller@gmx.de>
Date: Tue, 21 Oct 2025 07:54:03 +0000
Subject: [PATCH 1084/1124] change localhost to 127.0.0.1 in assets/runtime

squash following commits:

- 32f5332b05a6064169e6cc07d9c4a60b6a3dc7c5
  for configgitlab-pages/config
- f974a0197c74ca17343e5e3ff99a633347d8ad67
  for config/gitlab-shell/config.yml
- 1104bacb29ed7f20bdf20015552299bd08ae7313
  for config/gitlabhq/cable.yml
- 6ce37d8706cb289136385a7c498ad8c42faaab2c
  for config/gitlabhq/resque.yml
- 7336e042728f63da2cc302b6fd6f975eb26566dc
  for config/nginx/gitlab
- 1f39dcaabe7d3daa3b70ef0ae98ea8e30659e1e0
  for config/nginx/gitlab-pages
- 76aaf571e992c6e5b970a437f8c46158d9867d65
  for config/nginx/gitlab-ssl
- 549f717ec0810c8e11f30fb40f08997c0b84b5e3
  for env-defaults but without KAS-related configs
  (original: add WEBTOKEN secret, remove GITLAB_KAS_SECRET)
---
 assets/runtime/config/gitaly/config.toml  | 2 +-
 assets/runtime/config/gitlab-pages/config | 2 +-
 assets/runtime/config/gitlabhq/cable.yml  | 4 ++--
 assets/runtime/config/gitlabhq/resque.yml | 4 ++--
 assets/runtime/config/nginx/gitlab        | 2 +-
 assets/runtime/config/nginx/gitlab-pages  | 2 +-
 assets/runtime/config/nginx/gitlab-ssl    | 2 +-
 assets/runtime/env-defaults               | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml
index 0b070505e..8cc1400d9 100644
--- a/assets/runtime/config/gitaly/config.toml
+++ b/assets/runtime/config/gitaly/config.toml
@@ -94,5 +94,5 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 
 [gitlab]
 secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
-url = "http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}"
+url = "http://127.0.0.1:8181{{GITLAB_RELATIVE_URL_ROOT}}"
 
diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config
index 409786090..3377ed1c8 100644
--- a/assets/runtime/config/gitlab-pages/config
+++ b/assets/runtime/config/gitlab-pages/config
@@ -4,5 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
 auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
 gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
 artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
-internal-gitlab-server=http://localhost:8181
+internal-gitlab-server=http://127.0.0.1:8181
 api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml
index d36e74fe1..e59afed65 100644
--- a/assets/runtime/config/gitlabhq/cable.yml
+++ b/assets/runtime/config/gitlabhq/cable.yml
@@ -2,11 +2,11 @@
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
 development:
   adapter: redis
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   channel_prefix: gitlab_development
 test:
   adapter: redis
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   channel_prefix: gitlab_test
 production:
   adapter: redis
diff --git a/assets/runtime/config/gitlabhq/resque.yml b/assets/runtime/config/gitlabhq/resque.yml
index 7a6681536..1d7349e2e 100644
--- a/assets/runtime/config/gitlabhq/resque.yml
+++ b/assets/runtime/config/gitlabhq/resque.yml
@@ -2,7 +2,7 @@
 # a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   # sentinels:
   #   -
   #     host: localhost
@@ -11,7 +11,7 @@ development:
   #     host: slave2
   #     port: 26381 # point to sentinel, not to redis port
 test:
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
 production:
   # Redis (single instance)
   url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}}
diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
index 75001235e..185ee0451 100644
--- a/assets/runtime/config/nginx/gitlab
+++ b/assets/runtime/config/nginx/gitlab
@@ -17,7 +17,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  server localhost:8181 fail_timeout=0;
+  server 127.0.0.1:8181 fail_timeout=0;
 }
 
 map $http_upgrade $connection_upgrade_gitlab {
diff --git a/assets/runtime/config/nginx/gitlab-pages b/assets/runtime/config/nginx/gitlab-pages
index 6f2978dde..c9f006c3b 100644
--- a/assets/runtime/config/nginx/gitlab-pages
+++ b/assets/runtime/config/nginx/gitlab-pages
@@ -15,7 +15,7 @@ server {
     proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
     proxy_set_header    X-Forwarded-Proto   $scheme;
     # The same address as passed to GitLab Pages: `-listen-proxy`
-    proxy_pass          http://localhost:8090/;
+    proxy_pass          http://127.0.0.1:8090/;
   }
   # Define custom error pages
   error_page 403 /403.html;
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
index 1057e0926..b52b86a67 100644
--- a/assets/runtime/config/nginx/gitlab-ssl
+++ b/assets/runtime/config/nginx/gitlab-ssl
@@ -21,7 +21,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  server localhost:8181 fail_timeout=0;
+  server 127.0.0.1:8181 fail_timeout=0;
 }
 
 map $http_upgrade $connection_upgrade_gitlab_ssl {
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index d3269e8ee..275aaf5c6 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -15,7 +15,7 @@ GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
 GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}"
 GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2}
 GITLAB_HTTPS=${GITLAB_HTTPS:-false}
-GITLAB_HOST=${GITLAB_HOST:-localhost}
+GITLAB_HOST=${GITLAB_HOST:-127.0.0.1}
 GITLAB_CI_HOST=${GITLAB_CI_HOST:-}
 GITLAB_PORT=${GITLAB_PORT:-}
 GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true}
@@ -270,7 +270,7 @@ GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-false}
 GITLAB_REGISTRY_DIR="${GITLAB_REGISTRY_DIR:-$GITLAB_SHARED_DIR/registry}"
 GITLAB_REGISTRY_HOST=${GITLAB_REGISTRY_HOST:-registry.example.com}
 GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
-GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://localhost:5000/}
+GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://127.0.0.1:5000/}
 GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-config/registry.key}
 GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
 GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}

From ae373c5525297f3a7fb99b2cd41fbfd5eddfca3f Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 13 Nov 2025 18:01:15 +0100
Subject: [PATCH 1085/1124] Upgrade GitLab CE to 18.5.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9d9654314..7cbd1eb35 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.5.2
+
+- gitlab: upgrade CE to v18.5.2
+- gitaly: upgrade to v18.5.2
+- gitlab-pages: upgrade to v18.5.2
+- golang: upgrade to v1.24.10
+
 ## 18.5.1
 
 - gitlab: upgrade CE to v18.5.1
diff --git a/Dockerfile b/Dockerfile
index 7712fb6be..50ea38e1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20251001
 
-ARG VERSION=18.5.1
+ARG VERSION=18.5.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.9 \
+    GOLANG_VERSION=1.24.10 \
     GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.5.1 \
-    GITALY_SERVER_VERSION=18.5.1 \
+    GITLAB_PAGES_VERSION=18.5.2 \
+    GITALY_SERVER_VERSION=18.5.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 5ecf8e454..65ac196e7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.5.1
+# sameersbn/gitlab:18.5.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.1
+docker pull sameersbn/gitlab:18.5.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.5.1
+ sameersbn/gitlab:18.5.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.5.1
+    sameersbn/gitlab:18.5.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:sanitize
+    sameersbn/gitlab:18.5.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake db:setup
+    sameersbn/gitlab:18.5.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.5.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.5.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.5.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.1
+docker pull sameersbn/gitlab:18.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 82f73fb75..ac7f6a6c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.5.1
+18.5.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 97fe9d52e..930f387bf 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index de799f1d0..c2de9635e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e9752f2c..b44c1840e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index d04f39a5b..84adaf5d4 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.1
+docker pull sameersbn/gitlab:18.5.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.5.1
+sameersbn/gitlab:18.5.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 903ba799c..e065d7c49 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 24b75c8db..0bbb7c6a1 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.1
+    image: sameersbn/gitlab:18.5.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e069a6814..2d8a1482e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.5.1
+        image: sameersbn/gitlab:18.5.2
         env:
         - name: TZ
           value: Asia/Kolkata

From e87766c7dad2399ff09c1d270b098110f0cc03ad Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 21 Nov 2025 19:01:26 +0100
Subject: [PATCH 1086/1124] Upgrade GitLab CE to 18.6.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7cbd1eb35..733801029 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.6.0
+
+- gitlab: upgrade CE to v18.6.0
+- gitaly: upgrade to v18.6.0
+- gitlab-pages: upgrade to v18.6.0
+- ubuntu: upgrade to noble-20251013
+
 ## 18.5.2
 
 - gitlab: upgrade CE to v18.5.2
diff --git a/Dockerfile b/Dockerfile
index 50ea38e1f..955827324 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:noble-20251001
+FROM ubuntu:noble-20251013
 
-ARG VERSION=18.5.2
+ARG VERSION=18.6.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.10 \
     GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.5.2 \
-    GITALY_SERVER_VERSION=18.5.2 \
+    GITLAB_PAGES_VERSION=18.6.0 \
+    GITALY_SERVER_VERSION=18.6.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 65ac196e7..006619007 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.5.2
+# sameersbn/gitlab:18.6.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.2
+docker pull sameersbn/gitlab:18.6.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.5.2
+ sameersbn/gitlab:18.6.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.5.2
+    sameersbn/gitlab:18.6.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:sanitize
+    sameersbn/gitlab:18.6.0 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake db:setup
+    sameersbn/gitlab:18.6.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.6.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.5.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.2
+docker pull sameersbn/gitlab:18.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.0
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ac7f6a6c8..4b5ebaf0f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.5.2
+18.6.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 930f387bf..95d6a0639 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index c2de9635e..2d2cb48ae 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index b44c1840e..6294c2547 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 84adaf5d4..8c6dc614f 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.5.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.5.2
+docker pull sameersbn/gitlab:18.6.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.5.2
+sameersbn/gitlab:18.6.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e065d7c49..c37b74d08 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 0bbb7c6a1..1add6bb92 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.5.2
+    image: sameersbn/gitlab:18.6.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 2d8a1482e..99fa93466 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.5.2
+        image: sameersbn/gitlab:18.6.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 5642f8750196ea0b8db5cbd184cc78f2d1f736ed Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 26 Nov 2025 22:06:37 +0100
Subject: [PATCH 1087/1124] Upgrade GitLab CE to 18.6.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 733801029..f5d387313 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.6.1
+
+- gitlab: upgrade CE to v18.6.1
+- gitaly: upgrade to v18.6.1
+- gitlab-pages: upgrade to v18.6.1
+
 ## 18.6.0
 
 - gitlab: upgrade CE to v18.6.0
diff --git a/Dockerfile b/Dockerfile
index 955827324..332534e02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20251013
 
-ARG VERSION=18.6.0
+ARG VERSION=18.6.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.10 \
     GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.6.0 \
-    GITALY_SERVER_VERSION=18.6.0 \
+    GITLAB_PAGES_VERSION=18.6.1 \
+    GITALY_SERVER_VERSION=18.6.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 006619007..3456f1616 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.6.0
+# sameersbn/gitlab:18.6.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.0
+docker pull sameersbn/gitlab:18.6.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.6.0
+ sameersbn/gitlab:18.6.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.6.0
+    sameersbn/gitlab:18.6.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:sanitize
+    sameersbn/gitlab:18.6.1 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake db:setup
+    sameersbn/gitlab:18.6.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.6.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.0
+docker pull sameersbn/gitlab:18.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.1
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 4b5ebaf0f..219ed4bd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.6.0
+18.6.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 95d6a0639..744231702 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 2d2cb48ae..d410adb85 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 6294c2547..d3d615fa9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 8c6dc614f..1ea77c57d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.0
+docker pull sameersbn/gitlab:18.6.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.6.0
+sameersbn/gitlab:18.6.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index c37b74d08..27af8aeab 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 1add6bb92..c306241c8 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.0
+    image: sameersbn/gitlab:18.6.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 99fa93466..544f03526 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.6.0
+        image: sameersbn/gitlab:18.6.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 042be1876abb0f32a259996e65876c65b37169ac Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 10 Dec 2025 22:06:04 +0100
Subject: [PATCH 1088/1124] Upgrade GitLab CE to 18.6.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f5d387313..bec58acda 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.6.2
+
+- gitlab: upgrade CE to v18.6.2
+- gitaly: upgrade to v18.6.2
+- gitlab-pages: upgrade to v18.6.2
+- golang: upgrade to v1.24.11
+
 ## 18.6.1
 
 - gitlab: upgrade CE to v18.6.1
diff --git a/Dockerfile b/Dockerfile
index 332534e02..debfcd7c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20251013
 
-ARG VERSION=18.6.1
+ARG VERSION=18.6.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.10 \
+    GOLANG_VERSION=1.24.11 \
     GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.6.1 \
-    GITALY_SERVER_VERSION=18.6.1 \
+    GITLAB_PAGES_VERSION=18.6.2 \
+    GITALY_SERVER_VERSION=18.6.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 3456f1616..d2b78192e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.6.1
+# sameersbn/gitlab:18.6.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.1
+docker pull sameersbn/gitlab:18.6.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.6.1
+ sameersbn/gitlab:18.6.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.6.1
+    sameersbn/gitlab:18.6.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:sanitize
+    sameersbn/gitlab:18.6.2 app:sanitize
 ```
 
 #### Piwik
@@ -2612,7 +2612,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2647,14 +2647,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake db:setup
+    sameersbn/gitlab:18.6.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2712,7 +2712,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.6.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.6.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.1
+docker pull sameersbn/gitlab:18.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.2
 ```
 
 ### Shell Access
@@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 219ed4bd8..fc558a423 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.6.1
+18.6.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 744231702..21ddc5832 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d410adb85..8938757e2 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index d3d615fa9..52d87375c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1ea77c57d..f0f99189b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.1
+docker pull sameersbn/gitlab:18.6.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.6.1
+sameersbn/gitlab:18.6.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 27af8aeab..b65c86b6d 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index c306241c8..cd9f99527 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.1
+    image: sameersbn/gitlab:18.6.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 544f03526..eb4ee606e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.6.1
+        image: sameersbn/gitlab:18.6.2
         env:
         - name: TZ
           value: Asia/Kolkata

From baa49e0398fe7e2608967cf546e78d4ab84ac802 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 31 Dec 2025 17:21:47 +0100
Subject: [PATCH 1089/1124] Upgrade GitLab CE to 18.7.0

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bec58acda..4bb828551 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.7.0
+
+- gitlab: upgrade CE to v18.7.0
+- gitaly: upgrade to v18.7.0
+- gitlab-pages: upgrade to v18.7.0
+- gitlab-shell: upgrade to v14.45.5
+
 ## 18.6.2
 
 - gitlab: upgrade CE to v18.6.2
diff --git a/Dockerfile b/Dockerfile
index debfcd7c7..741b9b968 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20251013
 
-ARG VERSION=18.6.2
+ARG VERSION=18.7.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
     RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.11 \
-    GITLAB_SHELL_VERSION=14.45.3 \
-    GITLAB_PAGES_VERSION=18.6.2 \
-    GITALY_SERVER_VERSION=18.6.2 \
+    GITLAB_SHELL_VERSION=14.45.5 \
+    GITLAB_PAGES_VERSION=18.7.0 \
+    GITALY_SERVER_VERSION=18.7.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index c0685382f..b2a816d07 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.6.2
+# sameersbn/gitlab:18.7.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.2
+docker pull sameersbn/gitlab:18.7.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.6.2
+ sameersbn/gitlab:18.7.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.6.2
+    sameersbn/gitlab:18.7.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:sanitize
+    sameersbn/gitlab:18.7.0 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake db:setup
+    sameersbn/gitlab:18.7.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.7.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.7.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.7.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.6.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.2
+docker pull sameersbn/gitlab:18.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.6.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.7.0
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fc558a423..fb67e3d51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.6.2
+18.7.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 21ddc5832..8c249db1c 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8938757e2..e7fe1d4bf 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 52d87375c..cc74b2440 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f0f99189b..0a0671bfa 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.6.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.6.2
+docker pull sameersbn/gitlab:18.7.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.6.2
+sameersbn/gitlab:18.7.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b65c86b6d..451aa5cfe 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cd9f99527..b14727075 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.6.2
+    image: sameersbn/gitlab:18.7.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index eb4ee606e..0b88ea69f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.6.2
+        image: sameersbn/gitlab:18.7.0
         env:
         - name: TZ
           value: Asia/Kolkata

From ab247bbb62583065ee8b053d2f28f358a5ce1c6d Mon Sep 17 00:00:00 2001
From: Nico Rausch <rausch.nico@gmail.com>
Date: Mon, 5 Jan 2026 13:53:54 +0100
Subject: [PATCH 1090/1124] Clarify Container Registry Docs

Update the Container Registry Documentation to explicitly state 2.x as registry version or include an optional JWKS file to use v3.
---
 docs/container_registry.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/container_registry.md b/docs/container_registry.md
index f0f99189b..aab3e0827 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -65,11 +65,18 @@ creation. This information is not used at all.
 
 #### Update docker-compose.yml
 
+> [!important]
+> Docker Registry v3 is currently not compatible with the JWT tokens signed by GitLab.
+> The example below uses `registry:2` to avoid issues in validating the token.
+> 
+> Alternatively, you can generate a JWKS file and specify it as `REGISTRY_AUTH_TOKEN_JWKS`
+> to run `registry:latest`. Further information can be found [here](https://github.com/cesanta/docker_auth/issues/386).
+
 First add the configuration for the registry container to your `docker-compose.yml`.
 
 ```yaml
     registry:
-        image: registry
+        image: registry:2
         restart: always
         expose:
             - "5000"
@@ -251,7 +258,7 @@ storage:
  ...
  registry:
     restart: always
-    image: registry:2.4.1
+    image: registry:2.8.3
     volumes:
      - ./certs:/certs
     environment:
@@ -365,7 +372,7 @@ docker run --name registry -d \
 --env 'REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer' \
 --env 'REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt' \
 --env 'REGISTRY_STORAGE_DELETE_ENABLED=true' \
-registry:2.4.1
+registry:2.8.3
 ```
 
 - **Step 6**: Start the image

From 1934927aebd8a2c323699443fea30e7d1ddbfbbf Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Tue, 6 Jan 2026 12:35:04 +0900
Subject: [PATCH 1091/1124] sync config/gitlabhq/puma.rb to gitlab v18.7.0

Without those changes puma (and then gitlab itself) does not starts

See following upstream changes:
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128619
  (overwritten by gitlab-org/gitlab!132581)
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132581
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/211331
---
 assets/runtime/config/gitlabhq/puma.rb | 62 ++++++++++++++++----------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
index df5b5eeac..f77342124 100644
--- a/assets/runtime/config/gitlabhq/puma.rb
+++ b/assets/runtime/config/gitlabhq/puma.rb
@@ -40,28 +40,45 @@
 
 require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events"
 
-on_restart do
-  # Signal application hooks that we're about to restart
-  Gitlab::Cluster::LifecycleEvents.do_before_master_restart
-end
+if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0')
+  Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
 
-before_fork do
-  # Signal to the puma killer
-  Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options, puma_per_worker_max_memory_mb: {{PUMA_PER_WORKER_MAX_MEMORY_MB}}, puma_master_max_memory_mb: {{PUMA_MASTER_MAX_MEMORY_MB}}) unless ENV['DISABLE_PUMA_WORKER_KILLER']
+  on_restart do
+    # Signal application hooks that we're about to restart
+    Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+  end
 
-  # Signal application hooks that we're about to fork
-  Gitlab::Cluster::LifecycleEvents.do_before_fork
-end
+  on_worker_boot do
+    # Signal application hooks of worker start
+    Gitlab::Cluster::LifecycleEvents.do_worker_start
+  end
 
-Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
-on_worker_boot do
-  # Signal application hooks of worker start
-  Gitlab::Cluster::LifecycleEvents.do_worker_start
+  on_worker_shutdown do
+    # Signal application hooks that a worker is shutting down
+    Gitlab::Cluster::LifecycleEvents.do_worker_stop
+  end
+else
+  Gitlab::Cluster::LifecycleEvents.set_puma_worker_count(3)
+
+  before_restart do
+    # Signal application hooks that we're about to restart
+    Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+  end
+
+  before_worker_boot do
+    # Signal application hooks of worker start
+    Gitlab::Cluster::LifecycleEvents.do_worker_start
+  end
+
+  before_worker_shutdown do
+    # Signal application hooks that a worker is shutting down
+    Gitlab::Cluster::LifecycleEvents.do_worker_stop
+  end
 end
 
-on_worker_shutdown do
-  # Signal application hooks that a worker is shutting down
-  Gitlab::Cluster::LifecycleEvents.do_worker_stop
+before_fork do
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
 end
 
 # Preload the application before starting the workers; this conflicts with
@@ -87,11 +104,10 @@
   json_formatter.call(str)
 end
 
-lowlevel_error_handler do |ex, env|
-  if Raven.configuration.capture_allowed?
-    Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
-  end
+require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma/error_handler"
+
+error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
 
-  # note the below is just a Rack response
-  [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+lowlevel_error_handler do |ex, env, status_code|
+  error_handler.execute(ex, env, status_code)
 end

From a967a0f434c75ec37c26f633ab9ee83b796e7f16 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 9 Jan 2026 19:16:56 +0100
Subject: [PATCH 1092/1124] Upgrade GitLab CE to 18.7.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4bb828551..c7e4adf41 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.7.1
+
+- gitlab: upgrade CE to v18.7.1
+- gitaly: upgrade to v18.7.1
+- gitlab-pages: upgrade to v18.7.1
+
 ## 18.7.0
 
 - gitlab: upgrade CE to v18.7.0
diff --git a/Dockerfile b/Dockerfile
index 741b9b968..c1dcad3fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20251013
 
-ARG VERSION=18.7.0
+ARG VERSION=18.7.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.9 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.11 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.7.0 \
-    GITALY_SERVER_VERSION=18.7.0 \
+    GITLAB_PAGES_VERSION=18.7.1 \
+    GITALY_SERVER_VERSION=18.7.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index b2a816d07..ddef1f1de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.7.0
+# sameersbn/gitlab:18.7.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.0
+docker pull sameersbn/gitlab:18.7.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.7.0
+ sameersbn/gitlab:18.7.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.7.0
+    sameersbn/gitlab:18.7.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:sanitize
+    sameersbn/gitlab:18.7.1 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake db:setup
+    sameersbn/gitlab:18.7.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.7.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.7.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.7.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.7.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.0
+docker pull sameersbn/gitlab:18.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.7.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.7.1
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index fb67e3d51..afa98def6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.7.0
+18.7.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8c249db1c..1c5443d65 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e7fe1d4bf..e4de1cf75 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index cc74b2440..06f5d630b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 0a0671bfa..dbd1e1ccd 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.0
+docker pull sameersbn/gitlab:18.7.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.7.0
+sameersbn/gitlab:18.7.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 451aa5cfe..dac475f31 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index b14727075..cd353e9db 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.0
+    image: sameersbn/gitlab:18.7.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 0b88ea69f..b775e5a74 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.7.0
+        image: sameersbn/gitlab:18.7.1
         env:
         - name: TZ
           value: Asia/Kolkata

From a0699c1445a694d6d236d2ffef770afed7aaa1bc Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 17 Jan 2026 20:42:37 +0100
Subject: [PATCH 1093/1124] Upgrade GitLab CE to 18.8.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 14 +++----
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c7e4adf41..198cfd4e4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.8.0
+
+- gitlab: upgrade CE to v18.8.0
+- gitaly: upgrade to v18.8.0
+- gitlab-pages: upgrade to v18.8.0
+- golang: upgrade to v1.24.12
+- ruby: upgrade to v3.2.10
+- ubuntu: upgrade to noble-20260113
+
 ## 18.7.1
 
 - gitlab: upgrade CE to v18.7.1
diff --git a/Dockerfile b/Dockerfile
index c1dcad3fc..fa6b47de0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20251013
+FROM ubuntu:noble-20260113
 
-ARG VERSION=18.7.1
+ARG VERSION=18.8.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.9 \
-    RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
+    RUBY_VERSION=3.2.10 \
+    RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.11 \
+    GOLANG_VERSION=1.24.12 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.7.1 \
-    GITALY_SERVER_VERSION=18.7.1 \
+    GITLAB_PAGES_VERSION=18.8.0 \
+    GITALY_SERVER_VERSION=18.8.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index ddef1f1de..9df73e1fc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.7.1
+# sameersbn/gitlab:18.8.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.1
+docker pull sameersbn/gitlab:18.8.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.7.1
+ sameersbn/gitlab:18.8.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.7.1
+    sameersbn/gitlab:18.8.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:sanitize
+    sameersbn/gitlab:18.8.0 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake db:setup
+    sameersbn/gitlab:18.8.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.8.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.7.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.1
+docker pull sameersbn/gitlab:18.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.7.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.0
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index afa98def6..3efdc42f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.7.1
+18.8.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 1c5443d65..8491a61fe 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index e4de1cf75..0160100a5 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 06f5d630b..ad590bc71 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index dbd1e1ccd..e0265b9fd 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.7.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.7.1
+docker pull sameersbn/gitlab:18.8.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.7.1
+sameersbn/gitlab:18.8.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index dac475f31..e0e8991b4 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index cd353e9db..238e14abb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.7.1
+    image: sameersbn/gitlab:18.8.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b775e5a74..bf29b70b3 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.7.1
+        image: sameersbn/gitlab:18.8.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 7ce363bb276b18e627c2fad933d761496d8b25cd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 21 Jan 2026 05:29:57 +0100
Subject: [PATCH 1094/1124] Upgrade GitLab CE to 18.8.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 198cfd4e4..35011a373 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.8.1
+
+- gitlab: upgrade CE to v18.8.1
+- gitaly: upgrade to v18.8.1
+- gitlab-pages: upgrade to v18.8.1
+
 ## 18.8.0
 
 - gitlab: upgrade CE to v18.8.0
diff --git a/Dockerfile b/Dockerfile
index fa6b47de0..aecda7846 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260113
 
-ARG VERSION=18.8.0
+ARG VERSION=18.8.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.12 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.8.0 \
-    GITALY_SERVER_VERSION=18.8.0 \
+    GITLAB_PAGES_VERSION=18.8.1 \
+    GITALY_SERVER_VERSION=18.8.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 9df73e1fc..bcddc6479 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.8.0
+# sameersbn/gitlab:18.8.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.0
+docker pull sameersbn/gitlab:18.8.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.8.0
+ sameersbn/gitlab:18.8.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.8.0
+    sameersbn/gitlab:18.8.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:sanitize
+    sameersbn/gitlab:18.8.1 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake db:setup
+    sameersbn/gitlab:18.8.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.8.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.8.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.0
+docker pull sameersbn/gitlab:18.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.1
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 3efdc42f2..ea7a20f48 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.8.0
+18.8.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 8491a61fe..eb5741051 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 0160100a5..a944ad93b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ad590bc71..dd81f9bd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index e0265b9fd..9661b3681 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.0
+docker pull sameersbn/gitlab:18.8.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.8.0
+sameersbn/gitlab:18.8.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index e0e8991b4..375931cef 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 238e14abb..17c5095c9 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.0
+    image: sameersbn/gitlab:18.8.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index bf29b70b3..a8b4f276a 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.8.0
+        image: sameersbn/gitlab:18.8.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 18371bbb947e6bcdc2df17cacddc65b37e200d52 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 21 Jan 2026 16:37:06 +0100
Subject: [PATCH 1095/1124] Upgrade GitLab CE to 18.8.2

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 35011a373..e850562ed 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.8.2
+
+- gitlab: upgrade CE to v18.8.2
+- gitaly: upgrade to v18.8.2
+- gitlab-pages: upgrade to v18.8.2
+
 ## 18.8.1
 
 - gitlab: upgrade CE to v18.8.1
diff --git a/Dockerfile b/Dockerfile
index aecda7846..189aae117 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260113
 
-ARG VERSION=18.8.1
+ARG VERSION=18.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.12 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.8.1 \
-    GITALY_SERVER_VERSION=18.8.1 \
+    GITLAB_PAGES_VERSION=18.8.2 \
+    GITALY_SERVER_VERSION=18.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index bcddc6479..23055cff1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.8.1
+# sameersbn/gitlab:18.8.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.1
+docker pull sameersbn/gitlab:18.8.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.8.1
+ sameersbn/gitlab:18.8.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.8.1
+    sameersbn/gitlab:18.8.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:sanitize
+    sameersbn/gitlab:18.8.2 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake db:setup
+    sameersbn/gitlab:18.8.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.8.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.1
+docker pull sameersbn/gitlab:18.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.2
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index ea7a20f48..a3f22d908 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.8.1
+18.8.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index eb5741051..84e338183 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index a944ad93b..39a5b84bb 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dd81f9bd0..061924007 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9661b3681..9a92d6bae 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -291,7 +291,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -308,7 +308,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -327,7 +327,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.1
+docker pull sameersbn/gitlab:18.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -381,7 +381,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.8.1
+sameersbn/gitlab:18.8.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 375931cef..b135c87c6 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 17c5095c9..6eae3dc79 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.1
+    image: sameersbn/gitlab:18.8.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index a8b4f276a..05726d73f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.8.1
+        image: sameersbn/gitlab:18.8.2
         env:
         - name: TZ
           value: Asia/Kolkata

From bc0f427cd150f9130f8eb0f34ca1c5a86034bcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rondeau?= <r.rondeau@loxodata.com>
Date: Mon, 2 Feb 2026 09:12:08 +0100
Subject: [PATCH 1096/1124] fix: Puma does not support SIGQUIT but use SIGTERM
 the default kill signal

puma doc : https://github.com/puma/puma/blob/main/docs/signals.md#puma-signals
---
 assets/build/install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 817fd61cf..46782235e 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -354,7 +354,6 @@ command=bundle exec puma --config ${GITLAB_INSTALL_DIR}/config/puma.rb --environ
 user=git
 autostart=true
 autorestart=true
-stopsignal=QUIT
 stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
 stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log
 EOF

From 0c64d3cbbedd28bd1e6fbf4e2254a7d6af09cfd0 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Fri, 6 Feb 2026 06:32:34 +0100
Subject: [PATCH 1097/1124] Upgrade GitLab CE to 18.8.3

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e850562ed..d63ea6111 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.8.3
+
+- gitlab: upgrade CE to v18.8.3
+- gitaly: upgrade to v18.8.3
+- gitlab-pages: upgrade to v18.8.3
+
 ## 18.8.2
 
 - gitlab: upgrade CE to v18.8.2
diff --git a/Dockerfile b/Dockerfile
index 189aae117..e1ac6bec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20260113
 
-ARG VERSION=18.8.2
+ARG VERSION=18.8.3
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
     RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.12 \
+    GOLANG_VERSION=1.24.13 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.8.2 \
-    GITALY_SERVER_VERSION=18.8.2 \
+    GITLAB_PAGES_VERSION=18.8.3 \
+    GITALY_SERVER_VERSION=18.8.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 23055cff1..6e3785a00 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.8.2
+# sameersbn/gitlab:18.8.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.2
+docker pull sameersbn/gitlab:18.8.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.8.2
+ sameersbn/gitlab:18.8.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.8.2
+    sameersbn/gitlab:18.8.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:sanitize
+    sameersbn/gitlab:18.8.3 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake db:setup
+    sameersbn/gitlab:18.8.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.8.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.8.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.2
+docker pull sameersbn/gitlab:18.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.3
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index a3f22d908..e4652fb20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.8.2
+18.8.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 84e338183..44d8a52db 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 39a5b84bb..edf2b22b7 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 061924007..534746847 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f844e911f..84509938d 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.2
+docker pull sameersbn/gitlab:18.8.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.8.2
+sameersbn/gitlab:18.8.3
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index b135c87c6..a1a00d7c5 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6eae3dc79..a9e9a0244 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.2
+    image: sameersbn/gitlab:18.8.3
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 05726d73f..ac289c774 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.8.2
+        image: sameersbn/gitlab:18.8.3
         env:
         - name: TZ
           value: Asia/Kolkata

From ae366b71ec8ccf6f169dfaeaaaab1838aeb484f5 Mon Sep 17 00:00:00 2001
From: Nick Shek <kcshek@hko.hksarg>
Date: Wed, 11 Feb 2026 18:38:10 +0800
Subject: [PATCH 1098/1124] Upgrade GitLab CE to 18.8.4

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d63ea6111..fbfda4fc1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.8.4
+
+- gitlab: upgrade CE to v18.8.4
+- gitaly: upgrade to v18.8.4
+- gitlab-pages: upgrade to v18.8.4
+
 ## 18.8.3
 
 - gitlab: upgrade CE to v18.8.3
diff --git a/Dockerfile b/Dockerfile
index e1ac6bec4..35f0f6e7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260113
 
-ARG VERSION=18.8.3
+ARG VERSION=18.8.4
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=3.7.2 \
     GOLANG_VERSION=1.24.13 \
     GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.8.3 \
-    GITALY_SERVER_VERSION=18.8.3 \
+    GITLAB_PAGES_VERSION=18.8.4 \
+    GITALY_SERVER_VERSION=18.8.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 6e3785a00..d7dae3c6b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.8.3
+# sameersbn/gitlab:18.8.4
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.3
+docker pull sameersbn/gitlab:18.8.4
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.8.3
+ sameersbn/gitlab:18.8.4
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.8.3
+    sameersbn/gitlab:18.8.4
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:sanitize
+    sameersbn/gitlab:18.8.4 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake db:setup
+    sameersbn/gitlab:18.8.4 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:env:info
+    sameersbn/gitlab:18.8.4 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.4 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.8.4 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.8.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.3
+docker pull sameersbn/gitlab:18.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.4
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e4652fb20..69fd27509 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.8.3
+18.8.4
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 44d8a52db..78da80675 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index edf2b22b7..9a070f36e 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 534746847..5bd7dfeb0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 84509938d..77e426266 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.3
+docker pull sameersbn/gitlab:18.8.4
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.8.3
+sameersbn/gitlab:18.8.4
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index a1a00d7c5..67f39ca8c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index a9e9a0244..ef33b492e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.3
+    image: sameersbn/gitlab:18.8.4
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index ac289c774..6ffeb0b5b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.8.3
+        image: sameersbn/gitlab:18.8.4
         env:
         - name: TZ
           value: Asia/Kolkata

From 78b1923bc11d4caa9c775a1cf1c935ee3fbf876d Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 11 Feb 2026 20:12:56 +0100
Subject: [PATCH 1099/1124] Upgrade GitLab CE to 18.8.4

---
 Changelog.md | 2 ++
 Dockerfile   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index fbfda4fc1..4dc549049 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,8 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitlab: upgrade CE to v18.8.4
 - gitaly: upgrade to v18.8.4
 - gitlab-pages: upgrade to v18.8.4
+- golang: upgrade to v1.25.7
+- rubygems: upgrade to v4.0.6
 
 ## 18.8.3
 
diff --git a/Dockerfile b/Dockerfile
index 35f0f6e7f..36d7f0cfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ ARG VERSION=18.8.4
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
     RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
-    RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.13 \
+    RUBYGEMS_VERSION=4.0.6 \
+    GOLANG_VERSION=1.25.7 \
     GITLAB_SHELL_VERSION=14.45.5 \
     GITLAB_PAGES_VERSION=18.8.4 \
     GITALY_SERVER_VERSION=18.8.4 \

From 792a2653b541d168f115921e49866701bc075150 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 22 Feb 2026 08:15:48 +0100
Subject: [PATCH 1100/1124] Upgrade GitLab CE to 18.9.0

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4dc549049..1f60551a1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.9.0
+
+- gitlab: upgrade CE to v18.9.0
+- gitaly: upgrade to v18.9.0
+- gitlab-pages: upgrade to v18.9.0
+- gitlab-shell: upgrade to v14.45.6
+- ubuntu: upgrade to noble-20260210.1
+
 ## 18.8.4
 
 - gitlab: upgrade CE to v18.8.4
diff --git a/Dockerfile b/Dockerfile
index 36d7f0cfd..810079aca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20260113
+FROM ubuntu:noble-20260210.1
 
-ARG VERSION=18.8.4
+ARG VERSION=18.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.2.10 \
     RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
     RUBYGEMS_VERSION=4.0.6 \
     GOLANG_VERSION=1.25.7 \
-    GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.8.4 \
-    GITALY_SERVER_VERSION=18.8.4 \
+    GITLAB_SHELL_VERSION=14.45.6 \
+    GITLAB_PAGES_VERSION=18.9.0 \
+    GITALY_SERVER_VERSION=18.9.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index d7dae3c6b..66ee4048e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.8.4
+# sameersbn/gitlab:18.9.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.4
+docker pull sameersbn/gitlab:18.9.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.8.4
+ sameersbn/gitlab:18.9.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.8.4
+    sameersbn/gitlab:18.9.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:sanitize
+    sameersbn/gitlab:18.9.0 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake db:setup
+    sameersbn/gitlab:18.9.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:env:info
+    sameersbn/gitlab:18.9.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.8.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.4
+docker pull sameersbn/gitlab:18.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.8.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.0
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 69fd27509..f7e67778b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.8.4
+18.9.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 78da80675..919c77c43 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9a070f36e..bdc6e18c1 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5bd7dfeb0..dff00f4c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 77e426266..1153ce0ee 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.8.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.8.4
+docker pull sameersbn/gitlab:18.9.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.8.4
+sameersbn/gitlab:18.9.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 67f39ca8c..32df31530 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index ef33b492e..f3196d173 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.8.4
+    image: sameersbn/gitlab:18.9.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 6ffeb0b5b..89f1e3f4b 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.8.4
+        image: sameersbn/gitlab:18.9.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 3568674ae04408437711f96183aac81623101549 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 22 Feb 2026 08:52:25 +0100
Subject: [PATCH 1101/1124] Add install dependency

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

diff --git a/Dockerfile b/Dockerfile
index 810079aca..0a59f982d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,7 @@ RUN set -ex && \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
       sudo supervisor logrotate locales curl \
+      meson \
       nginx openssh-server redis-tools \
       postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 postgresql-client-17 \
       python3 python3-docutils nodejs yarn gettext-base graphicsmagick \

From 24d1a02296d20cb5825b97db2944703639aab3ba Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Tue, 3 Mar 2026 18:22:46 +0900
Subject: [PATCH 1102/1124] Add patch to fix gitlab:setup (backport MR225503)

Partially apply patch below:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/225503

Adjust line number so that can backport to 18.9.0 directly
---
 .../0005_fix-gitlab-setup-mr225503.patch      | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch

diff --git a/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch b/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch
new file mode 100644
index 000000000..fdf15339e
--- /dev/null
+++ b/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch
@@ -0,0 +1,45 @@
+From a39aef6cf81149d940061d56f358d220dbf90159 Mon Sep 17 00:00:00 2001
+From: Vasilii Iakliushin <viakliushin@gitlab.com>
+Date: Mon, 2 Mar 2026 15:21:34 +0100
+Subject: [PATCH 1/2] Fix gitlab:setup failure on fresh database
+
+Contributes to https://gitlab.com/gitlab-org/gitlab/-/issues/591292
+
+**Problem**
+
+Running `gitlab:setup` on a fresh PostgreSQL database fails with
+`PG::UndefinedTable: ERROR: relation "feature_gates" does not exist`.
+
+This regression was introduced in 18.9 by
+https://gitlab.com/gitlab-org/gitlab/-/merge_requests/220200 which added
+a circuit breaker to the Gitaly client. The `CircuitBreaker#enabled?`
+method calls `Feature.enabled?` before the database schema is
+initialized, causing Flipper to query the non-existent `feature_gates`
+table.
+
+**Solution**
+
+Check `Feature::FlipperFeature.table_exists?` before calling
+`Feature.enabled?` in `CircuitBreaker#enabled?`. This follows the
+established pattern used in `lib/feature/gitaly.rb`.
+
+Changelog: fixed
+---
+ lib/gitlab/gitaly_client/circuit_breaker.rb     |  2 ++
+ .../gitaly_client/circuit_breaker_spec.rb       | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/lib/gitlab/gitaly_client/circuit_breaker.rb b/lib/gitlab/gitaly_client/circuit_breaker.rb
+index f7f2a79b5d7a..05924b641581 100644
+--- a/lib/gitlab/gitaly_client/circuit_breaker.rb
++++ b/lib/gitlab/gitaly_client/circuit_breaker.rb
+@@ -39,6 +39,8 @@ def check!
+       attr_reader :service, :rpc, :storage
+ 
+       def enabled?
++        return false unless Feature::FlipperFeature.table_exists?
++
+         Feature.enabled?(:add_circuit_breaker_to_gitaly, Feature.current_request)
+       end
+ 
+

From 59af0561de9908a0e6d33dddf08be61c1f55a127 Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Tue, 3 Mar 2026 23:22:31 +0900
Subject: [PATCH 1103/1124] Stop puma and sidekiq before migrating database

They sometimes crash and not required
---
 entrypoint.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/entrypoint.sh b/entrypoint.sh
index 2f3b15959..d231106f2 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,6 +20,13 @@ case ${1} in
       app:start)
         /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf &
         SUPERVISOR_PID=$!
+        while ! test -e "/var/run/supervisor.sock" 2>/dev/null; do
+          echo "waiting supervisor to start"
+          sleep 1
+        done
+        set +e
+        supervisorctl stop sidekiq gitlab:puma
+        set -e
         migrate_database
         kill -15 $SUPERVISOR_PID
         if ps h -p $SUPERVISOR_PID > /dev/null ; then

From ea7ec92f3ae96038a822b1b26124ce4f71358db2 Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Tue, 3 Mar 2026 23:25:04 +0900
Subject: [PATCH 1104/1124] Upgrade ruby to 3.3.10

Disable patch for ruby (backport from 3.3.x so no longer needed)
---
 Dockerfile                                                    | 4 ++--
 ...ruby3.3.0.patch => 0001-avoid-seeding_until-ruby3.3.0.bak} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename assets/build/patches/ruby/{0001-avoid-seeding_until-ruby3.3.0.patch => 0001-avoid-seeding_until-ruby3.3.0.bak} (100%)

diff --git a/Dockerfile b/Dockerfile
index 0a59f982d..212595259 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:noble-20260210.1
 ARG VERSION=18.9.0
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.10 \
-    RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
+    RUBY_VERSION=3.3.10 \
+    RUBY_SOURCE_SHA256SUM="b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928" \
     RUBYGEMS_VERSION=4.0.6 \
     GOLANG_VERSION=1.25.7 \
     GITLAB_SHELL_VERSION=14.45.6 \
diff --git a/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch b/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.bak
similarity index 100%
rename from assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch
rename to assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.bak

From 386663f39f23a694941208e63edcf7cac70de344 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 4 Mar 2026 19:55:43 +0100
Subject: [PATCH 1105/1124] Update Changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 1f60551a1..96c0751d1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan
 - gitaly: upgrade to v18.9.0
 - gitlab-pages: upgrade to v18.9.0
 - gitlab-shell: upgrade to v14.45.6
+- ruby: upgrade to v3.3.10
 - ubuntu: upgrade to noble-20260210.1
 
 ## 18.8.4

From 4b6f1d3aa6897173c9bf67156d420228159d4ddc Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 4 Mar 2026 20:34:25 +0100
Subject: [PATCH 1106/1124] Upgrade GitLab CE to 18.9.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 96c0751d1..4385ceb72 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.9.1
+
+- gitlab: upgrade CE to v18.9.1
+- gitaly: upgrade to v18.9.1
+- gitlab-pages: upgrade to v18.9.1
+
 ## 18.9.0
 
 - gitlab: upgrade CE to v18.9.0
diff --git a/Dockerfile b/Dockerfile
index 212595259..f80c12f39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260210.1
 
-ARG VERSION=18.9.0
+ARG VERSION=18.9.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.10 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=4.0.6 \
     GOLANG_VERSION=1.25.7 \
     GITLAB_SHELL_VERSION=14.45.6 \
-    GITLAB_PAGES_VERSION=18.9.0 \
-    GITALY_SERVER_VERSION=18.9.0 \
+    GITLAB_PAGES_VERSION=18.9.1 \
+    GITALY_SERVER_VERSION=18.9.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 66ee4048e..f0e14dbf9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.9.0
+# sameersbn/gitlab:18.9.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.0
+docker pull sameersbn/gitlab:18.9.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.9.0
+ sameersbn/gitlab:18.9.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.9.0
+    sameersbn/gitlab:18.9.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:sanitize
+    sameersbn/gitlab:18.9.1 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake db:setup
+    sameersbn/gitlab:18.9.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.9.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.9.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.0
+docker pull sameersbn/gitlab:18.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.1
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index f7e67778b..b9dfa5d6f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.9.0
+18.9.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 919c77c43..ff029dd0d 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index bdc6e18c1..3d4ee1f59 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index dff00f4c9..89e84c6e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 1153ce0ee..893a2c315 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.0
+docker pull sameersbn/gitlab:18.9.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.9.0
+sameersbn/gitlab:18.9.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 32df31530..083925cd0 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f3196d173..842e6f2b4 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.0
+    image: sameersbn/gitlab:18.9.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 89f1e3f4b..f538e24b6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.9.0
+        image: sameersbn/gitlab:18.9.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 2a2f47c50241c7355425616ab7089eaef6875776 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 12 Mar 2026 15:45:37 +0100
Subject: [PATCH 1107/1124] Upgrade GitLab CE to 18.9.2

---
 Changelog.md                            |  8 ++++
 Dockerfile                              | 10 ++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4385ceb72..d7fd33d7d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,14 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.9.2
+
+- gitlab: upgrade CE to v18.9.2
+- gitaly: upgrade to v18.9.2
+- gitlab-pages: upgrade to v18.9.2
+- golang: upgrade to v1.25.8
+- rubygems: upgrade to v4.0.8
+
 ## 18.9.1
 
 - gitlab: upgrade CE to v18.9.1
diff --git a/Dockerfile b/Dockerfile
index f80c12f39..97e323ad7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20260210.1
 
-ARG VERSION=18.9.1
+ARG VERSION=18.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.10 \
     RUBY_SOURCE_SHA256SUM="b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928" \
-    RUBYGEMS_VERSION=4.0.6 \
-    GOLANG_VERSION=1.25.7 \
+    RUBYGEMS_VERSION=4.0.8 \
+    GOLANG_VERSION=1.25.8 \
     GITLAB_SHELL_VERSION=14.45.6 \
-    GITLAB_PAGES_VERSION=18.9.1 \
-    GITALY_SERVER_VERSION=18.9.1 \
+    GITLAB_PAGES_VERSION=18.9.2 \
+    GITALY_SERVER_VERSION=18.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f0e14dbf9..fe0c4e70e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.9.1
+# sameersbn/gitlab:18.9.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.1
+docker pull sameersbn/gitlab:18.9.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.9.1
+ sameersbn/gitlab:18.9.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.9.1
+    sameersbn/gitlab:18.9.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:sanitize
+    sameersbn/gitlab:18.9.2 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake db:setup
+    sameersbn/gitlab:18.9.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.9.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.9.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.9.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.1
+docker pull sameersbn/gitlab:18.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.2
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index b9dfa5d6f..308e27a3e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.9.1
+18.9.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index ff029dd0d..a70bcfa52 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 3d4ee1f59..d139e825b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 89e84c6e9..329271b8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 893a2c315..9eff9510b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.1
+docker pull sameersbn/gitlab:18.9.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.9.1
+sameersbn/gitlab:18.9.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 083925cd0..68f43a073 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 842e6f2b4..981274efc 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.1
+    image: sameersbn/gitlab:18.9.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index f538e24b6..974e3582e 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.9.1
+        image: sameersbn/gitlab:18.9.2
         env:
         - name: TZ
           value: Asia/Kolkata

From 40cb1183ad4f2220a965fa347a167c0419a6c85c Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Mar 2026 20:39:55 +0100
Subject: [PATCH 1108/1124] Upgrade GitLab CE to 18.10.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d7fd33d7d..cd4818900 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.10.0
+
+- gitlab: upgrade CE to v18.10.0
+- gitaly: upgrade to v18.10.0
+- gitlab-pages: upgrade to v18.10.0
+- gitlab-shell: upgrade to v14.47.0
+- rubygems: upgrade to v4.0.9
+- ubuntu: upgrade to noble-20260217
+
 ## 18.9.2
 
 - gitlab: upgrade CE to v18.9.2
diff --git a/Dockerfile b/Dockerfile
index 97e323ad7..92e34040e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20260210.1
+FROM ubuntu:noble-20260217
 
-ARG VERSION=18.9.2
+ARG VERSION=18.10.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.10 \
     RUBY_SOURCE_SHA256SUM="b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928" \
-    RUBYGEMS_VERSION=4.0.8 \
+    RUBYGEMS_VERSION=4.0.9 \
     GOLANG_VERSION=1.25.8 \
-    GITLAB_SHELL_VERSION=14.45.6 \
-    GITLAB_PAGES_VERSION=18.9.2 \
-    GITALY_SERVER_VERSION=18.9.2 \
+    GITLAB_SHELL_VERSION=14.47.0 \
+    GITLAB_PAGES_VERSION=18.10.0 \
+    GITALY_SERVER_VERSION=18.10.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index fe0c4e70e..29466b776 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.9.2
+# sameersbn/gitlab:18.10.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.2
+docker pull sameersbn/gitlab:18.10.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.9.2
+ sameersbn/gitlab:18.10.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.9.2
+    sameersbn/gitlab:18.10.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:sanitize
+    sameersbn/gitlab:18.10.0 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake db:setup
+    sameersbn/gitlab:18.10.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:env:info
+    sameersbn/gitlab:18.10.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.9.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.2
+docker pull sameersbn/gitlab:18.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.9.2
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.0
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 308e27a3e..5036cb7c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.9.2
+18.10.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a70bcfa52..f30b3531e 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index d139e825b..b1d7969c3 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 329271b8a..4e9396b8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 9eff9510b..145dbfbeb 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.9.2 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.9.2
+docker pull sameersbn/gitlab:18.10.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.9.2
+sameersbn/gitlab:18.10.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 68f43a073..5dcf896aa 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 981274efc..6a48a4565 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.9.2
+    image: sameersbn/gitlab:18.10.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 974e3582e..b592847c2 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.9.2
+        image: sameersbn/gitlab:18.10.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 40e23117f21d20c0a921b312d70551b66a47042a Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Mar 2026 20:44:36 +0100
Subject: [PATCH 1109/1124] Revert "Add patch to fix gitlab:setup (backport
 MR225503)"

This reverts commit 24d1a02296d20cb5825b97db2944703639aab3ba.
---
 .../0005_fix-gitlab-setup-mr225503.patch      | 45 -------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch

diff --git a/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch b/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch
deleted file mode 100644
index fdf15339e..000000000
--- a/assets/build/patches/gitlabhq/0005_fix-gitlab-setup-mr225503.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a39aef6cf81149d940061d56f358d220dbf90159 Mon Sep 17 00:00:00 2001
-From: Vasilii Iakliushin <viakliushin@gitlab.com>
-Date: Mon, 2 Mar 2026 15:21:34 +0100
-Subject: [PATCH 1/2] Fix gitlab:setup failure on fresh database
-
-Contributes to https://gitlab.com/gitlab-org/gitlab/-/issues/591292
-
-**Problem**
-
-Running `gitlab:setup` on a fresh PostgreSQL database fails with
-`PG::UndefinedTable: ERROR: relation "feature_gates" does not exist`.
-
-This regression was introduced in 18.9 by
-https://gitlab.com/gitlab-org/gitlab/-/merge_requests/220200 which added
-a circuit breaker to the Gitaly client. The `CircuitBreaker#enabled?`
-method calls `Feature.enabled?` before the database schema is
-initialized, causing Flipper to query the non-existent `feature_gates`
-table.
-
-**Solution**
-
-Check `Feature::FlipperFeature.table_exists?` before calling
-`Feature.enabled?` in `CircuitBreaker#enabled?`. This follows the
-established pattern used in `lib/feature/gitaly.rb`.
-
-Changelog: fixed
----
- lib/gitlab/gitaly_client/circuit_breaker.rb     |  2 ++
- .../gitaly_client/circuit_breaker_spec.rb       | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/lib/gitlab/gitaly_client/circuit_breaker.rb b/lib/gitlab/gitaly_client/circuit_breaker.rb
-index f7f2a79b5d7a..05924b641581 100644
---- a/lib/gitlab/gitaly_client/circuit_breaker.rb
-+++ b/lib/gitlab/gitaly_client/circuit_breaker.rb
-@@ -39,6 +39,8 @@ def check!
-       attr_reader :service, :rpc, :storage
- 
-       def enabled?
-+        return false unless Feature::FlipperFeature.table_exists?
-+
-         Feature.enabled?(:add_circuit_breaker_to_gitaly, Feature.current_request)
-       end
- 
-

From 44f3a3c7d9a6549b040252a714ab3b78189cc3fd Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 26 Mar 2026 17:49:50 +0100
Subject: [PATCH 1110/1124] Upgrade GitLab CE to 18.10.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index cd4818900..5e3d7ad29 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.10.1
+
+- gitlab: upgrade CE to v18.10.1
+- gitaly: upgrade to v18.10.1
+- gitlab-pages: upgrade to v18.10.1
+
 ## 18.10.0
 
 - gitlab: upgrade CE to v18.10.0
diff --git a/Dockerfile b/Dockerfile
index 92e34040e..0907214f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260217
 
-ARG VERSION=18.10.0
+ARG VERSION=18.10.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.10 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=4.0.9 \
     GOLANG_VERSION=1.25.8 \
     GITLAB_SHELL_VERSION=14.47.0 \
-    GITLAB_PAGES_VERSION=18.10.0 \
-    GITALY_SERVER_VERSION=18.10.0 \
+    GITLAB_PAGES_VERSION=18.10.1 \
+    GITALY_SERVER_VERSION=18.10.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 29466b776..f2dd1c91a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.10.0
+# sameersbn/gitlab:18.10.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.0
+docker pull sameersbn/gitlab:18.10.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.10.0
+ sameersbn/gitlab:18.10.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.10.0
+    sameersbn/gitlab:18.10.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:sanitize
+    sameersbn/gitlab:18.10.1 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake db:setup
+    sameersbn/gitlab:18.10.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.10.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.10.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.0
+docker pull sameersbn/gitlab:18.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.1
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 5036cb7c0..046b2c6db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.10.0
+18.10.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index f30b3531e..29d9eef24 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index b1d7969c3..de4517b2d 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e9396b8d..be0176502 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 145dbfbeb..bfc77f660 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.0
+docker pull sameersbn/gitlab:18.10.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.10.0
+sameersbn/gitlab:18.10.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 5dcf896aa..059737fbb 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6a48a4565..6af70406a 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.0
+    image: sameersbn/gitlab:18.10.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index b592847c2..e0914cc8f 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.10.0
+        image: sameersbn/gitlab:18.10.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 5a9e591122122467807e96f16394498c563536b7 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 8 Apr 2026 21:10:46 +0200
Subject: [PATCH 1111/1124] Upgrade GitLab CE to 18.10.3

---
 Changelog.md                            | 10 +++++
 Dockerfile                              | 16 ++++----
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5e3d7ad29..4fa57a7f7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,16 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.10.3
+
+- gitlab: upgrade CE to v18.10.3
+- gitaly: upgrade to v18.10.3
+- gitlab-pages: upgrade to v18.10.3
+- golang: upgrade to v1.25.9
+- ruby: upgrade to v3.2.11
+- rubygems: upgrade to v4.0.10
+- ubuntu: upgrade to noble-20260324
+
 ## 18.10.1
 
 - gitlab: upgrade CE to v18.10.1
diff --git a/Dockerfile b/Dockerfile
index 0907214f6..a090b929f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20260217
+FROM ubuntu:noble-20260324
 
-ARG VERSION=18.10.1
+ARG VERSION=18.10.3
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.3.10 \
-    RUBY_SOURCE_SHA256SUM="b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928" \
-    RUBYGEMS_VERSION=4.0.9 \
-    GOLANG_VERSION=1.25.8 \
+    RUBY_VERSION=3.3.11 \
+    RUBY_SOURCE_SHA256SUM="59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0" \
+    RUBYGEMS_VERSION=4.0.10 \
+    GOLANG_VERSION=1.25.9 \
     GITLAB_SHELL_VERSION=14.47.0 \
-    GITLAB_PAGES_VERSION=18.10.1 \
-    GITALY_SERVER_VERSION=18.10.1 \
+    GITLAB_PAGES_VERSION=18.10.3 \
+    GITALY_SERVER_VERSION=18.10.3 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f2dd1c91a..63164c0b0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.10.1
+# sameersbn/gitlab:18.10.3
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.1
+docker pull sameersbn/gitlab:18.10.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.10.1
+ sameersbn/gitlab:18.10.3
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.10.1
+    sameersbn/gitlab:18.10.3
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:sanitize
+    sameersbn/gitlab:18.10.3 app:sanitize
 ```
 
 #### Piwik
@@ -2620,7 +2620,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2655,14 +2655,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake db:setup
+    sameersbn/gitlab:18.10.3 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2671,7 +2671,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2720,7 +2720,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.10.3 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2733,7 +2733,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2764,7 +2764,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2795,12 +2795,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.10.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.1
+docker pull sameersbn/gitlab:18.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2830,7 +2830,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.3
 ```
 
 ### Shell Access
@@ -2866,7 +2866,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 046b2c6db..d42de7e1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.10.1
+18.10.3
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 29d9eef24..b5b04bc88 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index de4517b2d..da53758aa 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index be0176502..aca087360 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bfc77f660..019a6ae40 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.1
+docker pull sameersbn/gitlab:18.10.3
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.10.1
+sameersbn/gitlab:18.10.3
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 059737fbb..14095cf67 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 6af70406a..5eaba994d 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.1
+    image: sameersbn/gitlab:18.10.3
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index e0914cc8f..13b621913 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.10.1
+        image: sameersbn/gitlab:18.10.3
         env:
         - name: TZ
           value: Asia/Kolkata

From f8e05f23a49b09a34e34afb771d87838302b89d1 Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:39:30 +0200
Subject: [PATCH 1112/1124] Update README.md

documenz new variables
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 63164c0b0..240ab7626 100644
--- a/README.md
+++ b/README.md
@@ -1236,6 +1236,14 @@ Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSO
 
 Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'`
 
+##### `GITLAB_ADMIN_EMAIL_WORKER_CRON`
+
+Cron notation for the GitLab admin email worker. Defaults to `'0 0 * * 0'`
+
+##### `GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON`
+
+Cron notation for the GitLab personal access tokens expiring worker. Defaults to `'0 1 * * *'`
+
 ##### `GITLAB_LFS_ENABLED`
 
 Enable/Disable Git LFS support. Defaults to `true`.

From a10f30d5d42ac287164bd2371729302fc1d7b40f Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:44:46 +0200
Subject: [PATCH 1113/1124] Update gitlab.yml

add new variables; sync section with upstream
---
 assets/runtime/config/gitlabhq/gitlab.yml | 30 +++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 6961a63ce..61ba1cf0c 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -440,6 +440,11 @@ production: &base
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
   # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
   cron_jobs:
+    # Interval, in seconds, for each Sidekiq process to check for scheduled cron jobs that need to be enqueued. If not
+    # set, the interval scales dynamically with the number of Sidekiq processes. If set to 0, disable polling for cron
+    # jobs entirely.
+    # poll_interval: 30
+
     # Flag stuck CI jobs as failed
     stuck_ci_jobs_worker:
       cron: "0 * * * *"
@@ -449,9 +454,18 @@ production: &base
     # Remove expired build artifacts
     expire_build_artifacts_worker:
       cron: "50 * * * *"
+    # Remove expired pipeline artifacts
+    ci_pipelines_expire_artifacts_worker:
+      cron: "*/23 * * * *"
+    # Remove files from object storage
+    ci_schedule_delete_objects_worker:
+      cron: "*/16 * * * *"
     # Stop expired environments
     environments_auto_stop_cron_worker:
       cron: "24 * * * *"
+    # Delete stopped environments
+    environments_auto_delete_cron_worker:
+      cron: "34 * * * *"
     # Periodically run 'git fsck' on all repositories. If started more than
     # once per hour you will have concurrent 'git fsck' jobs.
     repository_check_worker:
@@ -461,10 +475,10 @@ production: &base
       cron: "17 * * * *"
     # Send admin emails once a week
     admin_email_worker:
-      cron: "0 0 * * 0"
+      cron: "{{GITLAB_ADMIN_EMAIL_WORKER_CRON}}"
     # Send emails for personal tokens which are about to expire
     personal_access_tokens_expiring_worker:
-      cron: "0 1 * * *"
+      cron: "{{GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON}}"
 
     # Remove outdated repository archives
     repository_archive_cache_worker:
@@ -478,6 +492,18 @@ production: &base
     schedule_migrate_external_diffs_worker:
       cron: "15 * * * *"
 
+    # Periodically update ci_runner_versions table with up-to-date versions and status.
+    ci_runner_versions_reconciliation_worker:
+      cron: "@daily"
+
+    # Periodically clean up stale runner machines.
+    ci_runners_stale_machines_cleanup_worker:
+      cron: "36 * * * *"
+
+    # Periodically queue syncing of finished pipelines from p_ci_finished_pipeline_ch_sync_events to ClickHouse
+    ci_click_house_finished_pipelines_sync_worker:
+      cron: "*/4 * * * *"
+
   # GitLab EE only jobs. These jobs are automatically enabled for an EE
   # installation, and ignored for a CE installation.
   ee_cron_jobs:

From 870f3c3469ca72c74a245360070e8ac25e9ab525 Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:46:10 +0200
Subject: [PATCH 1114/1124] Update env-defaults

add default for new variables
---
 assets/runtime/env-defaults | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 483446924..94f47237c 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -195,6 +195,8 @@ GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB
 
 ## Cron Jobs
 GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"}
+GITLAB_ADMIN_EMAIL_WORKER_CRON=${GITLAB_ADMIN_EMAIL_WORKER_CRON:-"0 0 * * 0"}
+GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON=${GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON:-"0 1 * * *"}
 
 ## LFS
 GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true}

From 7f5edbce50cc5e522a32b029ccdc08202769e74c Mon Sep 17 00:00:00 2001
From: th-2021 <90853655+th-2021@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:48:07 +0200
Subject: [PATCH 1115/1124] Update functions

add new variables for cron jobs
---
 assets/runtime/functions | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/assets/runtime/functions b/assets/runtime/functions
index d714f8c80..88911e3ce 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1093,6 +1093,18 @@ gitlab_configure_cron_jobs() {
   else
     exec_as_git sed -i "/{{GITLAB_PIPELINE_SCHEDULE_WORKER_CRON}}/d" ${GITLAB_CONFIG}
   fi
+
+  if [[ -n "${GITLAB_ADMIN_EMAIL_WORKER_CRON}" ]]; then
+    update_template ${GITLAB_CONFIG} GITLAB_ADMIN_EMAIL_WORKER_CRON
+  else
+    exec_as_git sed -i "/{{GITLAB_ADMIN_EMAIL_WORKER_CRON}}/d" ${GITLAB_CONFIG}
+  fi
+
+  if [[ -n "${GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON}" ]]; then
+    update_template ${GITLAB_CONFIG} GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON
+  else
+    exec_as_git sed -i "/{{GITLAB_PERSONAL_ACCESS_TOKEN_EXPIRING_WORKER_CRON}}/d" ${GITLAB_CONFIG}
+  fi
 }
 
 gitlab_configure_analytics_google() {

From 343921e8dfff6690f22b6228d17f91006afd6529 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Apr 2026 11:20:44 +0200
Subject: [PATCH 1116/1124] Upgrade GitLab CE to 18.11.0

---
 Changelog.md                            |  9 +++++
 Dockerfile                              | 12 +++---
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4fa57a7f7..2c30aacfc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,15 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.11.0
+
+- gitlab: upgrade CE to v18.11.0
+- gitaly: upgrade to v18.11.0
+- gitlab-pages: upgrade to v18.11.0
+- gitlab-shell: upgrade to v14.49.0
+- golang: upgrade to v1.26.2
+- ubuntu: upgrade to noble-20260410
+
 ## 18.10.3
 
 - gitlab: upgrade CE to v18.10.3
diff --git a/Dockerfile b/Dockerfile
index a090b929f..e98ce2522 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20260324
+FROM ubuntu:noble-20260410
 
-ARG VERSION=18.10.3
+ARG VERSION=18.11.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.11 \
     RUBY_SOURCE_SHA256SUM="59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0" \
     RUBYGEMS_VERSION=4.0.10 \
-    GOLANG_VERSION=1.25.9 \
-    GITLAB_SHELL_VERSION=14.47.0 \
-    GITLAB_PAGES_VERSION=18.10.3 \
-    GITALY_SERVER_VERSION=18.10.3 \
+    GOLANG_VERSION=1.26.2 \
+    GITLAB_SHELL_VERSION=14.49.0 \
+    GITLAB_PAGES_VERSION=18.11.0 \
+    GITALY_SERVER_VERSION=18.11.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 240ab7626..84a6cd687 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.10.3
+# sameersbn/gitlab:18.11.0
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.3
+docker pull sameersbn/gitlab:18.11.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.10.3
+ sameersbn/gitlab:18.11.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.10.3
+    sameersbn/gitlab:18.11.0
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:sanitize
+    sameersbn/gitlab:18.11.0 app:sanitize
 ```
 
 #### Piwik
@@ -2628,7 +2628,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2663,14 +2663,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake db:setup
+    sameersbn/gitlab:18.11.0 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2679,7 +2679,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2728,7 +2728,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:env:info
+    sameersbn/gitlab:18.11.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2741,7 +2741,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2772,7 +2772,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2803,12 +2803,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.10.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.3
+docker pull sameersbn/gitlab:18.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2838,7 +2838,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.0
 ```
 
 ### Shell Access
@@ -2874,7 +2874,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index d42de7e1b..9b7b3ce8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.10.3
+18.11.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index b5b04bc88..715dbdb12 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index da53758aa..8099ec101 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index aca087360..f1cf11dd1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 019a6ae40..bfb2c8d1c 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.10.3
+docker pull sameersbn/gitlab:18.11.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.10.3
+sameersbn/gitlab:18.11.0
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 14095cf67..04a404296 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 5eaba994d..d93cf1261 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.10.3
+    image: sameersbn/gitlab:18.11.0
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 13b621913..083fd3cc7 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.10.3
+        image: sameersbn/gitlab:18.11.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 4bf4dc10e6ee918901da12313d0eab305fe6fe16 Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Sat, 18 Apr 2026 17:19:15 +0900
Subject: [PATCH 1117/1124] install: run infection_scanner.mjs before
 asset:compile

GitLab 18.11.0.
If not it reports error like :

> [webpack-cli] Error: [vue3-infection] Infection scanner data not found at /home/git/gitlab/tmp/infection_scanner.json.
> Run: node scripts/frontend/infection_scanner/infection_scanner.mjs
---
 assets/build/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index 46782235e..ee1ba2668 100755
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -211,6 +211,7 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 exec_as_git yarn install --production --pure-lockfile
 
 echo "Compiling assets. Please be patient, this could take a while..."
+node scripts/frontend/infection_scanner/infection_scanner.mjs
 exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=8192"
 
 # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml

From 96f4ee41f3aefebab21d4c9f1f56224d4ba754de Mon Sep 17 00:00:00 2001
From: KIMURA Kazunori <norytama.k2@gmail.com>
Date: Sat, 18 Apr 2026 17:20:25 +0900
Subject: [PATCH 1118/1124] Update node.js to 22.x

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

diff --git a/Dockerfile b/Dockerfile
index e98ce2522..d2b35bda2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@ RUN set -ex && \
  && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
  && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
- && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
+ && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
  && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
  && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
  && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \

From 21bc232c1e15e20b5af547f9432d92fe9afd43e3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sat, 18 Apr 2026 14:35:37 +0200
Subject: [PATCH 1119/1124] Remove empty line

---
 CI_MIGRATION.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CI_MIGRATION.md b/CI_MIGRATION.md
index b2dd7a3d5..b1d84ac7d 100644
--- a/CI_MIGRATION.md
+++ b/CI_MIGRATION.md
@@ -122,4 +122,3 @@ If you are using a reverse proxy, update the configuration such that `ci.example
 ## Step 7 - Done!
 
 You can now start the GitLab server normally. Make sure that `GITLAB_CI_HOST` and `GITLAB_SECRETS_DB_KEY_BASE` are defined in your containers environment.
-

From 9f79883dcdead83aed27f29383deabf4bb8cd303 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 22 Apr 2026 20:02:57 +0200
Subject: [PATCH 1120/1124] Upgrade GitLab CE to 18.11.1

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  6 +--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2c30aacfc..c3be20d6b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.11.1
+
+- gitlab: upgrade CE to v18.11.1
+- gitaly: upgrade to v18.11.1
+- gitlab-pages: upgrade to v18.11.1
+
 ## 18.11.0
 
 - gitlab: upgrade CE to v18.11.0
diff --git a/Dockerfile b/Dockerfile
index d2b35bda2..0f7798d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:noble-20260410
 
-ARG VERSION=18.11.0
+ARG VERSION=18.11.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.11 \
@@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \
     RUBYGEMS_VERSION=4.0.10 \
     GOLANG_VERSION=1.26.2 \
     GITLAB_SHELL_VERSION=14.49.0 \
-    GITLAB_PAGES_VERSION=18.11.0 \
-    GITALY_SERVER_VERSION=18.11.0 \
+    GITLAB_PAGES_VERSION=18.11.1 \
+    GITALY_SERVER_VERSION=18.11.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 84a6cd687..4edd9e0ec 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.11.0
+# sameersbn/gitlab:18.11.1
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.0
+docker pull sameersbn/gitlab:18.11.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.11.0
+ sameersbn/gitlab:18.11.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.11.0
+    sameersbn/gitlab:18.11.1
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:sanitize
+    sameersbn/gitlab:18.11.1 app:sanitize
 ```
 
 #### Piwik
@@ -2628,7 +2628,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2663,14 +2663,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake db:setup
+    sameersbn/gitlab:18.11.1 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2679,7 +2679,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2728,7 +2728,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:env:info
+    sameersbn/gitlab:18.11.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2741,7 +2741,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2772,7 +2772,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2803,12 +2803,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.11.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.0
+docker pull sameersbn/gitlab:18.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2838,7 +2838,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.1
 ```
 
 ### Shell Access
@@ -2874,7 +2874,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 9b7b3ce8c..75beb73cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.11.0
+18.11.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 715dbdb12..5b069ae03 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 8099ec101..0b4d3436b 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index f1cf11dd1..ca3f109e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index bfb2c8d1c..52b10b113 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.0
+docker pull sameersbn/gitlab:18.11.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.11.0
+sameersbn/gitlab:18.11.1
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 04a404296..9b5b6019c 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index d93cf1261..f31ef932e 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.0
+    image: sameersbn/gitlab:18.11.1
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 083fd3cc7..c43faf36c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.11.0
+        image: sameersbn/gitlab:18.11.1
         env:
         - name: TZ
           value: Asia/Kolkata

From 523a760874e4082ab02a6a512af335f80d424af3 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Thu, 30 Apr 2026 17:29:50 +0200
Subject: [PATCH 1121/1124] Upgrade GitLab CE to 18.11.2

---
 Changelog.md                            |  7 ++++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c3be20d6b..42f8907a4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,13 @@
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
 gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
 
+## 18.11.2
+
+- gitlab: upgrade CE to v18.11.2
+- gitaly: upgrade to v18.11.2
+- gitlab-pages: upgrade to v18.11.2
+- rubygems: upgrade to v4.0.11
+
 ## 18.11.1
 
 - gitlab: upgrade CE to v18.11.1
diff --git a/Dockerfile b/Dockerfile
index 0f7798d30..dbd3cb5ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM ubuntu:noble-20260410
 
-ARG VERSION=18.11.1
+ARG VERSION=18.11.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=3.3.11 \
     RUBY_SOURCE_SHA256SUM="59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0" \
-    RUBYGEMS_VERSION=4.0.10 \
+    RUBYGEMS_VERSION=4.0.11 \
     GOLANG_VERSION=1.26.2 \
     GITLAB_SHELL_VERSION=14.49.0 \
-    GITLAB_PAGES_VERSION=18.11.1 \
-    GITALY_SERVER_VERSION=18.11.1 \
+    GITLAB_PAGES_VERSION=18.11.2 \
+    GITALY_SERVER_VERSION=18.11.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index 4edd9e0ec..fcabd00a6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.11.1
+# sameersbn/gitlab:18.11.2
 
 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
 
@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.1
+docker pull sameersbn/gitlab:18.11.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
     --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -245,7 +245,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 ### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
     --env 'DB_NAME=gitlabhq_production' \
     --env 'DB_USER=gitlab' --env 'DB_PASS=password' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 ##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
 ```bash
 docker run --name gitlab -d --link gitlab-postgresql:postgresql \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -392,7 +392,7 @@ The image can be configured to use an external redis server. The configuration s
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 #### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 #### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
 docker run --name gitlab -d \
     --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -452,7 +452,7 @@ docker run --name gitlab -d \
     --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
     --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -536,7 +536,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -552,7 +552,7 @@ docker run --name gitlab -d \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:18.11.1
+ sameersbn/gitlab:18.11.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
     --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
     --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -623,7 +623,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -850,14 +850,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:18.11.1
+    sameersbn/gitlab:18.11.2
 ```
 
 When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
 
 ```bash
 docker run --name gitlab -d [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:sanitize
+    sameersbn/gitlab:18.11.2 app:sanitize
 ```
 
 #### Piwik
@@ -2628,7 +2628,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:create
 ```
 
 A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2663,14 +2663,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake db:setup
+    sameersbn/gitlab:18.11.2 app:rake db:setup
 ```
 
 Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2679,7 +2679,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -2728,7 +2728,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:env:info
+    sameersbn/gitlab:18.11.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2741,7 +2741,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2772,7 +2772,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:import:repos
+    sameersbn/gitlab:18.11.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2803,12 +2803,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:18.11.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
+> Upgrading to `sameersbn/gitlab:18.11.2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.1
+docker pull sameersbn/gitlab:18.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2838,7 +2838,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.**
 
 ```bash
-docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.1
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.2
 ```
 
 ### Shell Access
@@ -2874,7 +2874,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
 ```yml
 services:
   gitlab:
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 75beb73cc..0ec67166a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.11.1
+18.11.2
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index 5b069ae03..e57558370 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 0b4d3436b..f22163743 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     depends_on:
       - redis
       - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index ca3f109e2..39e7c9149 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 52b10b113..c6bb67669 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:create
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:create
 ```
 
 ### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore
 ```
 
 The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:18.11.1 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 ## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:18.11.1
+docker pull sameersbn/gitlab:18.11.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
 --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
 --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
 --link registry:registry
-sameersbn/gitlab:18.11.1
+sameersbn/gitlab:18.11.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 9b5b6019c..d1bab5666 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     depends_on:
       - redis
       - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index f31ef932e..918b1d69b 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.11.1
+    image: sameersbn/gitlab:18.11.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index c43faf36c..0cdc42605 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.11.1
+        image: sameersbn/gitlab:18.11.2
         env:
         - name: TZ
           value: Asia/Kolkata

From c7aad63fcf45bb726ed8fcfca1f6da742418c07e Mon Sep 17 00:00:00 2001
From: Francis Caron <francis.caron@fsg.ulaval.ca>
Date: Wed, 22 Apr 2026 08:31:59 -0400
Subject: [PATCH 1122/1124] Add Microsoft Graph Mailer support

Adds support for GitLab's native Microsoft Graph Mailer to send emails via the Microsoft Graph API with OAuth 2.0 client credentials, as an alternative to SMTP. This addresses the deprecation of basic auth for SMTP AUTH on Exchange Online.

Closes #3239
---
 README.md                                 | 48 +++++++++++++++++++++++
 assets/runtime/config/gitlabhq/gitlab.yml | 13 ++++++
 assets/runtime/env-defaults               | 12 +++++-
 assets/runtime/functions                  | 19 +++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcabd00a6..f5f4225cc 100644
--- a/README.md
+++ b/README.md
@@ -437,6 +437,26 @@ docker run --name gitlab -d \
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
 
+##### Microsoft Graph Mailer
+
+As Microsoft is retiring basic authentication for SMTP AUTH on Exchange Online, mail delivery via SMTP using a Microsoft 365 mailbox is no longer viable for many tenants. The image supports GitLab's native Microsoft Graph Mailer, which sends emails via the Microsoft Graph API using OAuth 2.0 client credentials.
+
+To enable it, register an application in Azure AD, grant it the `Mail.Send` **Application** permission (not Delegated), and have an administrator consent to it. Then start the container with:
+
+```bash
+docker run --name gitlab -d \
+    --env 'MICROSOFT_GRAPH_MAILER_ENABLED=true' \
+    --env 'MICROSOFT_GRAPH_MAILER_USER_ID=00000000-0000-0000-0000-000000000000' \
+    --env 'MICROSOFT_GRAPH_MAILER_TENANT=contoso.onmicrosoft.com' \
+    --env 'MICROSOFT_GRAPH_MAILER_CLIENT_ID=11111111-1111-1111-1111-111111111111' \
+    --env 'MICROSOFT_GRAPH_MAILER_CLIENT_SECRET=YOUR_CLIENT_SECRET' \
+    --env 'GITLAB_EMAIL=sender@contoso.com' \
+    --volume /srv/docker/gitlab/gitlab:/home/git/data \
+    sameersbn/gitlab:18.11.0
+```
+
+`MICROSOFT_GRAPH_MAILER_USER_ID` is the Object ID of the Microsoft 365 user whose mailbox will be used, and `GITLAB_EMAIL` must be that user's primary email address. `SMTP_ENABLED` should stay at its default (`false`) when Graph Mailer is used. Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of Microsoft Graph Mailer parameters that can be specified.
+
 ##### Reply by email
 
 Since version `8.0.0` GitLab adds support for commenting on issues by replying to emails.
@@ -2019,6 +2039,34 @@ Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home
 
 Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`.
 
+##### `MICROSOFT_GRAPH_MAILER_ENABLED`
+
+Enable mail delivery via Microsoft Graph API. Defaults to `false`. When enabled, emails are sent using OAuth 2.0 client credentials via the Microsoft Graph `sendMail` endpoint instead of SMTP. Requires an Azure App Registration with the `Mail.Send` Application permission granted and admin-consented. When both `SMTP_ENABLED` and `MICROSOFT_GRAPH_MAILER_ENABLED` are `false`, GitLab mail delivery is disabled.
+
+##### `MICROSOFT_GRAPH_MAILER_USER_ID`
+
+The Object ID (GUID) of the Microsoft 365 user to send mail as. This must match the user whose mailbox the emails are sent from. `GITLAB_EMAIL` should match the primary email address of this user.
+
+##### `MICROSOFT_GRAPH_MAILER_TENANT`
+
+The Azure AD tenant ID (GUID) or tenant domain (e.g. `contoso.onmicrosoft.com`).
+
+##### `MICROSOFT_GRAPH_MAILER_CLIENT_ID`
+
+The Application (client) ID from the Azure App Registration.
+
+##### `MICROSOFT_GRAPH_MAILER_CLIENT_SECRET`
+
+The client secret value from the Azure App Registration.
+
+##### `MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT`
+
+Azure AD authority endpoint used to obtain an access token. Defaults to `https://login.microsoftonline.com`. Override for sovereign clouds (e.g. `https://login.microsoftonline.us` for Azure Government).
+
+##### `MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT`
+
+Microsoft Graph API endpoint. Defaults to `https://graph.microsoft.com`. Override for sovereign clouds (e.g. `https://graph.microsoft.us` for Azure Government).
+
 ##### `IMAP_ENABLED`
 
 Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 61ba1cf0c..bef7fed20 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -211,6 +211,19 @@ production: &base
     # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
     expunge_deleted: false
 
+  #start-microsoft-graph-mailer
+  ## Microsoft Graph Mailer
+  # Send emails via Microsoft Graph API with OAuth 2.0 client credentials.
+  microsoft_graph_mailer:
+    enabled: {{MICROSOFT_GRAPH_MAILER_ENABLED}}
+    user_id: "{{MICROSOFT_GRAPH_MAILER_USER_ID}}"
+    tenant: "{{MICROSOFT_GRAPH_MAILER_TENANT}}"
+    client_id: "{{MICROSOFT_GRAPH_MAILER_CLIENT_ID}}"
+    client_secret: "{{MICROSOFT_GRAPH_MAILER_CLIENT_SECRET}}"
+    azure_ad_endpoint: "{{MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT}}"
+    graph_endpoint: "{{MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT}}"
+  #end-microsoft-graph-mailer
+
   ## Build Artifacts
   artifacts:
     enabled: {{GITLAB_ARTIFACTS_ENABLED}}
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index 94f47237c..024f87760 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -362,7 +362,17 @@ if [[ -n ${SMTP_USER} ]]; then
   SMTP_AUTHENTICATION=${SMTP_AUTHENTICATION:-login}
 fi
 SMTP_ENABLED=${SMTP_ENABLED:-false}
-GITLAB_EMAIL_ENABLED=${GITLAB_EMAIL_ENABLED:-${SMTP_ENABLED}}
+MICROSOFT_GRAPH_MAILER_ENABLED=${MICROSOFT_GRAPH_MAILER_ENABLED:-false}
+MICROSOFT_GRAPH_MAILER_USER_ID=${MICROSOFT_GRAPH_MAILER_USER_ID:-}
+MICROSOFT_GRAPH_MAILER_TENANT=${MICROSOFT_GRAPH_MAILER_TENANT:-}
+MICROSOFT_GRAPH_MAILER_CLIENT_ID=${MICROSOFT_GRAPH_MAILER_CLIENT_ID:-}
+MICROSOFT_GRAPH_MAILER_CLIENT_SECRET=${MICROSOFT_GRAPH_MAILER_CLIENT_SECRET:-}
+MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT=${MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT:-https://login.microsoftonline.com}
+MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT=${MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT:-https://graph.microsoft.com}
+if [[ ${SMTP_ENABLED} == true || ${MICROSOFT_GRAPH_MAILER_ENABLED} == true ]]; then
+  GITLAB_EMAIL_ENABLED=${GITLAB_EMAIL_ENABLED:-true}
+fi
+GITLAB_EMAIL_ENABLED=${GITLAB_EMAIL_ENABLED:-false}
 GITLAB_EMAIL=${GITLAB_EMAIL:-${SMTP_USER}}
 GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-${GITLAB_EMAIL}}
 GITLAB_EMAIL_SUBJECT_SUFFIX=${GITLAB_EMAIL_SUBJECT_SUFFIX:-}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 88911e3ce..564d0e651 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -473,6 +473,24 @@ gitlab_configure_mail_delivery() {
   fi
 }
 
+gitlab_configure_microsoft_graph_mailer() {
+  if [[ ${MICROSOFT_GRAPH_MAILER_ENABLED} == true ]]; then
+    echo "Configuring gitlab::microsoft_graph_mailer..."
+    exec_as_git sed -i "/#start-microsoft-graph-mailer/d" ${GITLAB_CONFIG}
+    exec_as_git sed -i "/#end-microsoft-graph-mailer/d" ${GITLAB_CONFIG}
+    update_template ${GITLAB_CONFIG} \
+      MICROSOFT_GRAPH_MAILER_ENABLED \
+      MICROSOFT_GRAPH_MAILER_USER_ID \
+      MICROSOFT_GRAPH_MAILER_TENANT \
+      MICROSOFT_GRAPH_MAILER_CLIENT_ID \
+      MICROSOFT_GRAPH_MAILER_CLIENT_SECRET \
+      MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT \
+      MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT
+  else
+    exec_as_git sed -i "/#start-microsoft-graph-mailer/,/#end-microsoft-graph-mailer/d" ${GITLAB_CONFIG}
+  fi
+}
+
 gitlab_configure_mailroom() {
   if [[ ${IMAP_ENABLED} == true ]]; then
     echo "Configuring gitlab::incoming_email..."
@@ -2041,6 +2059,7 @@ configure_gitlab() {
   gitlab_configure_mattermost
   gitlab_configure_project_features
   gitlab_configure_mail_delivery
+  gitlab_configure_microsoft_graph_mailer
   gitlab_configure_mailroom
   gitlab_configure_oauth
   gitlab_configure_ldap

From db631c7aed303ffba575dcb4ca086590abd62e36 Mon Sep 17 00:00:00 2001
From: Francis Caron <francis.caron@fsg.ulaval.ca>
Date: Wed, 22 Apr 2026 15:42:18 -0400
Subject: [PATCH 1123/1124] Add TOC for Microsoft Graph Mailer

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f5f4225cc..fc0c91c47 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@
         - [External Redis Server](#external-redis-server)
         - [Linking to Redis Container](#linking-to-redis-container)
     - [Mail](#mail)
+        - [Microsoft Graph Mailer](#microsoft-graph-mailer)
         - [Reply by email](#reply-by-email)
     - [SSL](#ssl)
         - [Generation of a Self Signed Certificate](#generation-of-a-self-signed-certificate)

From 14a00080de56da20c7a17eb3cdc20c7f72331f54 Mon Sep 17 00:00:00 2001
From: Francis Caron <francis.caron@fsg.ulaval.ca>
Date: Sat, 25 Apr 2026 13:27:17 -0400
Subject: [PATCH 1124/1124] Match official gitlab.yml configuration

---
 assets/runtime/config/gitlabhq/gitlab.yml | 31 +++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index bef7fed20..fcae8801a 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -170,6 +170,24 @@ production: &base
     ## Disable jQuery and CSS animations
     # disable_animations: true
 
+  #start-microsoft-graph-mailer
+  # Allows delivery of emails using Microsoft Graph API with OAuth 2.0 client credentials flow.
+  microsoft_graph_mailer:
+    enabled: {{MICROSOFT_GRAPH_MAILER_ENABLED}}
+    # The unique identifier for the user. To use Microsoft Graph on behalf of the user.
+    user_id: "{{MICROSOFT_GRAPH_MAILER_USER_ID}}"
+    # The directory tenant the application plans to operate against, in GUID or domain-name format.
+    tenant: "{{MICROSOFT_GRAPH_MAILER_TENANT}}"
+    # The application ID that's assigned to your app. You can find this information in the portal where you registered your app.
+    client_id: "{{MICROSOFT_GRAPH_MAILER_CLIENT_ID}}"
+    # The client secret that you generated for your app in the app registration portal.
+    client_secret: "{{MICROSOFT_GRAPH_MAILER_CLIENT_SECRET}}"
+    # Defaults to "https://login.microsoftonline.com".
+    azure_ad_endpoint: "{{MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT}}"
+    # Defaults to "https://graph.microsoft.com".
+    graph_endpoint: "{{MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT}}"
+  #end-microsoft-graph-mailer
+
   ## Reply by email
   # Allow users to comment on issues and merge requests by replying to notification emails.
   # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
@@ -211,19 +229,6 @@ production: &base
     # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
     expunge_deleted: false
 
-  #start-microsoft-graph-mailer
-  ## Microsoft Graph Mailer
-  # Send emails via Microsoft Graph API with OAuth 2.0 client credentials.
-  microsoft_graph_mailer:
-    enabled: {{MICROSOFT_GRAPH_MAILER_ENABLED}}
-    user_id: "{{MICROSOFT_GRAPH_MAILER_USER_ID}}"
-    tenant: "{{MICROSOFT_GRAPH_MAILER_TENANT}}"
-    client_id: "{{MICROSOFT_GRAPH_MAILER_CLIENT_ID}}"
-    client_secret: "{{MICROSOFT_GRAPH_MAILER_CLIENT_SECRET}}"
-    azure_ad_endpoint: "{{MICROSOFT_GRAPH_MAILER_AZURE_AD_ENDPOINT}}"
-    graph_endpoint: "{{MICROSOFT_GRAPH_MAILER_GRAPH_ENDPOINT}}"
-  #end-microsoft-graph-mailer
-
   ## Build Artifacts
   artifacts:
     enabled: {{GITLAB_ARTIFACTS_ENABLED}}